diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java index 6c06afc8..29995176 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java @@ -366,6 +366,7 @@ public class SynchronizationAsmsService { int[] n = {0}; insertSplitList.forEach(sarFileSplitInfoEO -> { paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber()); + paramMap1.put("standardCode", sarFileSplitInfoEO.getSerialNumber()); List> mapListAll = asmsPostUtil.sendGetReq(splitUrl, paramMap1); List insertDocumentList = new ArrayList<>(); mapListAll.forEach(eMap -> { @@ -391,7 +392,7 @@ public class SynchronizationAsmsService { lawsDocumentSplit.setFunctionClassification((String) objectMap2.get("functionClassification")); lawsDocumentSplit.setFunctionProfessional((String) objectMap2.get("functionProfession")); - lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingName")); + lawsDocumentSplit.setFunctionGroupCode((String) objectMap2.get("groupingNum")); lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingNum")); lawsDocumentSplit.setCerImplementDate((String) objectMap2.get("implementDateCertified")); lawsDocumentSplit.setNewCerImplementDate((String) objectMap2.get("implementDateNewCer")); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index 9c5fb91d..bd033cca 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -402,7 +402,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl collect = userLinks.stream() diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml index 70b94386..51ca580a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -87,7 +87,7 @@ AND standard.source = #{param.source} - AND standard.responsible_department = #{param.responsibleDepartment} + AND standard.responsible_department LIKE CONCAT('%', #{param.responsibleDepartment}, '%') AND (standard.standard_number LIKE CONCAT('%', #{param.standardNumberOrName}, '%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index 15190e5d..18961c48 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -116,9 +116,12 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa private void sendMsgList(String templateCode, List distinctList, Boolean flag) { distinctList.forEach(data -> { String departId = data.getResponsibleDepartment(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysUserDepart::getDepId, departId); - List userDepartList = userDepartService.list(queryWrapper); + List userDepartList = new ArrayList<>(); + if (StringUtils.isNotBlank(departId)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysUserDepart::getDepId, Arrays.asList(departId.split(","))); + userDepartList = userDepartService.list(queryWrapper); + } if (CollectionUtils.isNotEmpty(userDepartList)) { // 每个部门需要发消息的用户id集合 List userIdList = userDepartList.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());