diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index feaf08c34..712f7eee0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -25,7 +25,6 @@ import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.dummy.enums.OrderEnum; -import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.oss.entity.OSSFile; @@ -1840,32 +1839,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI // 根据一级责任领域(统计节点),查询该一级责任领域下所有子责任领域的法规清单数据。 String dutyTerritoryStr = ""; if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getFirstLevelDutyTerritory())){ - List sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); - List dutyTerritorys = new ArrayList<>(); - Map> firstLevelDTMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(), sysDictItems); - String[] firstLevelDTArr = projectCertificationInventoryEO.getFirstLevelDutyTerritory().split(","); - for (String firstLevelDT : firstLevelDTArr){ - if(CollectionUtils.isNotEmpty(firstLevelDTMap.get(firstLevelDT))){ - dutyTerritorys.addAll(firstLevelDTMap.get(firstLevelDT)); - } - } - if(CollectionUtils.isNotEmpty(dutyTerritorys)){ - dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(",")); - } - } - if (StringUtils.isNotEmpty(dutyTerritoryStr)) { - String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*",""); - queryWrapper.and(query -> { - query.lambda().like(ProjectCertificationInventoryEO::getDutyTerritory, finalDutyTerritoryStr); - if(StringUtils.contains(finalDutyTerritoryStr,",")){ - String[] dutyTerritoryArr = finalDutyTerritoryStr.split(","); - for (String duty : dutyTerritoryArr) { - query.or(q -> { - q.like("duty_territory",duty); - }); - } - } - }); + queryWrapper.lambda().like(ProjectCertificationInventoryEO::getDutyDepart,projectCertificationInventoryEO.getFirstLevelDutyTerritory()); } LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); int isProjectRole = Integer.parseInt(roleCode);