diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 6ccf3ec38..e1c0ca2b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -1656,16 +1656,16 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(authDummyInventoryInfoEOList, cut, result, authDummyInventoryBaseId); +// List saveDataList = this.dataUniqueCheck(authDummyInventoryInfoEOList, cut, result, authDummyInventoryBaseId); try { - if(CollectionUtils.isNotEmpty(saveDataList)){ - this.saveBatch(saveDataList); + if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + this.saveBatch(authDummyInventoryInfoEOList); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); - String serialNumber1 = saveDataList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String serialNumber1 = authDummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"向清单中添加了“"+serialNumber1+"”"; String enContentLog = username+" added “"+serialNumber1+"” to the list."; authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); @@ -2148,9 +2148,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(addList, cut, result, authDummyInventoryBaseId); +// List saveDataList = this.dataUniqueCheck(addList, cut, result, authDummyInventoryBaseId); - this.saveBatch(saveDataList); + this.saveBatch(addList); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index dd1740697..7747a6371 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1484,6 +1484,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl flowStatusList = new ArrayList<>(); flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);