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 95cb3b506..1cbd1987d 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 @@ -1219,7 +1219,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); + // List dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); //编号验证 verifySerialNumber(datas,authDummyInventoryInfoEOTemp); @@ -1309,7 +1309,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl { + return StringUtils.isNotBlank(all); + }).distinct().collect(Collectors.toList()); + /* for(String all : allList){ if(all.equals("")){ allList.remove(all); } } + */ //遍历所有人alllist中是否包含责任人,如果包含,不用操作。 //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ @@ -6967,7 +6971,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); + // List dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); List userNameList = new ArrayList<>(); String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); @@ -7109,7 +7113,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index feb2a195e..a69653e10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -128,7 +128,12 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl deleteWrapper = new QueryWrapper<>(); - deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId()); + if(StringUtils.isNotBlank(processInfoDetailEO.getActiProcInstId())){ + deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId()); + } + if(StringUtils.isNotBlank(processInfoDetailEO.getProcessInfoId())){ + deleteWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoDetailEO.getProcessInfoId()); + } deleteWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,processInfoDetailEO.getUserId()); deleteWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,processInfoDetailEO.getFlowType()); this.baseMapper.delete(deleteWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index a4b5ddfe3..699bf2da2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -194,6 +194,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl pidQueryWrap = new QueryWrapper<>(); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + List pidInfoList = this.processInfoDetailEOService.list(pidQueryWrap); + + if(CollectionUtils.isNotEmpty(pidInfoList)){ + ProcessInfoEO processInfoEO = this.queryById(pidInfoList.get(0).getProcessInfoId()); + return Result.OK(processInfoEO); + } } return new Result<>().success("调用成功!"); }