diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index 4536b845..f2a140d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -129,9 +129,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl map = new HashMap<>(); // 人员信息 userInfoMap.forEach((key, value) -> { - if(Objects.equals("moreUserList",key)){ - map.put(key, Arrays.asList(value.toString().split(","))); - }else if(Objects.equals("checkUserLeader1List",key + "List") + if(Objects.equals("moreUserList",key + "List") + || Objects.equals("checkUserLeader1List",key + "List") || Objects.equals("checkUserLeader2List",key + "List")){ map.put(key, value); map.put(key + "List", Arrays.asList(value.toString().split(","))); @@ -208,14 +207,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl queryWrapperMarketStandardRelease = new LambdaQueryWrapper<>(); - queryWrapperMarketStandardRelease.select(ProcessMarketStandardRelease::getProcessInstanceId); queryWrapperMarketStandardRelease.eq(ProcessMarketStandardRelease::getManifestId,id); List listProcessMarketStandardRelease = list(queryWrapperMarketStandardRelease); if(CollectionUtils.isEmpty(listProcessMarketStandardRelease)){ return; } + List listStream = listProcessMarketStandardRelease.stream().filter(o-> + !StringUtils.isBlank(o.getProcessInstanceId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStream)){ + return; + } List listProcessInstanceId = listProcessMarketStandardRelease.stream() .map(ProcessMarketStandardRelease::getProcessInstanceId).collect(Collectors.toList()); LambdaQueryWrapper queryProcessAll = new LambdaQueryWrapper<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index e478f7ee..15180009 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -295,7 +295,7 @@ public class ProcessAllService extends ServiceImpl } - + @Transactional(rollbackFor = JeroBootException.class) public void delegateTask(DelegateTaskParam param) { String taskId = param.getTaskId(); String userId = param.getUserId();