diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 409dde28c..4fa0795d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -760,7 +760,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap()); + if(StringUtils.isNotBlank(serialNumber)){ + queryWrapper.lambda().like(ProjectLawsInventoryEO::getSerialNumber,serialNumber); + } queryWrapper.orderByDesc("create_time","serial_number"); if (StringUtils.isNotEmpty(dutyTerritoryStr)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 889883d41..65587a46f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -708,7 +708,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 1){ map.put("lawsInventoryId",projectLawsInventoryEO.getId()); - map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容,请选择关联"); + map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg); map.put("result",projectLawsInventoryEOS); mapList.add(map); }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){ @@ -1526,10 +1532,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 1){ map.put("lawsInventoryId",projectLawsInventoryEO.getId()); - map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容,请选择关联"); + map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg); map.put("result",projectLawsInventoryEOS); mapList.add(map); }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){