diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java index 2d4860be..88fc5f50 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java @@ -39,8 +39,9 @@ public class ActSarLawsInformationEOService { }else { createAndApproveBy = applyUserId + "," + approverId; } - sarLawsInformation.setDownloadableBy(createAndApproveBy); - sarLawsInformation.setViewableBy(createAndApproveBy); +// sarLawsInformation.setDownloadableBy(createAndApproveBy); +// sarLawsInformation.setViewableBy(createAndApproveBy); + sarLawsInformation.setCreateAndApproveBy(createAndApproveBy); logger.info("政策法规资料入库:" + sarLawsInformation); informationService.addLawsInformation(sarLawsInformation); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 55eaa3df..4e402000 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -233,9 +233,6 @@ public class SarLawsInformationServiceImpl extends ServiceImpl viewableByList = extractContentInParentheses(sarLawsInformation.getViewableBy()); - if (!viewableByList.contains(userId)) { - viewableByList.add(userId); - } viewableByList.forEach(viewableBy -> { SarLawsInformationAuth auth = new SarLawsInformationAuth(); auth.setLawsInformationId(sarLawsInformation.getId()); @@ -246,14 +243,11 @@ public class SarLawsInformationServiceImpl extends ServiceImpl downloadableByList = extractContentInParentheses(sarLawsInformation.getDownloadableBy()); - if (!downloadableByList.contains(userId)) { - downloadableByList.add(userId); - } - downloadableByList.forEach(viewableBy -> { + downloadableByList.forEach(downloadableBy -> { SarLawsInformationAuth auth = new SarLawsInformationAuth(); auth.setLawsInformationId(sarLawsInformation.getId()); auth.setAuthType("downloadableBy"); - auth.setUserId(viewableBy); + auth.setUserId(downloadableBy); authService.save(auth); }); }