diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 29aeb2bc..054beb6f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -29,8 +29,10 @@ import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; @@ -98,6 +100,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo); + // 找到当前企标的所有授权部门 + LambdaQueryWrapper adWrapper = new LambdaQueryWrapper<>(); + adWrapper.eq(EnterpriseStandardAuthDept::getStandardId, es.get(FieldCommon.ID)); + String authDeptIds = esAdService.list(adWrapper).stream() + .map(EnterpriseStandardAuthDept::getAuthDept) + .distinct().collect(Collectors.joining(",")); // 获取当前年份 Calendar date = Calendar.getInstance(); String curYearNumber = String.valueOf(date.get(Calendar.YEAR)); @@ -262,12 +273,13 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl