流程监听器调整

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/ApplyListener.java

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -76,19 +78,22 @@ public class ApplyListener implements ExecutionListener {
 
 
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("出纳");
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
-                String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                    String finalTitleName = titleName;
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/BorrowListener.java

@@ -1,6 +1,9 @@
 package com.jeeplus.modules.flowable.listener;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -76,21 +79,29 @@ public class BorrowListener implements ExecutionListener {
 
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("财务");
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("出纳");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                userDTOS.addAll(listByPostId);
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
+                if (ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    userDTOS.addAll(listByPostId);
+                }
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                }
+
                 String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (CollectionUtil.isNotEmpty(userDTOS)){
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/DimissionListener.java

@@ -1,6 +1,9 @@
 package com.jeeplus.modules.flowable.listener;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -76,19 +79,22 @@ public class DimissionListener implements ExecutionListener {
 
 
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("人事部");
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
-                String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                    String finalTitleName = titleName;
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/EvectionListener.java

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -74,20 +76,23 @@ public class EvectionListener implements ExecutionListener {
                 //获取到岗位为考勤管理员的人员信息
                 ArrayList<UserDTO> userDTOS = new ArrayList<>();
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("考勤管理员");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                userDTOS.addAll(listByPostId);
-
-                String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    userDTOS.addAll(listByPostId);
+
+                    String finalTitleName = titleName;
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/FinanceListener.java

@@ -2,6 +2,7 @@ package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.common.handler.CollectionUtils;
@@ -82,8 +83,11 @@ public class FinanceListener implements ExecutionListener {
                 List<UserDTO> user = SpringUtil.getBean(IUserApi.class).getMangeLeaderByUserId(userDTO.getId());
                 userDTOS.addAll(user);
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("总经理");
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                }
+
                 String finalTitleName = titleName;
                 userDTOS.stream().forEach(item->{
                     FlowCopy flowCopy = new FlowCopy();

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/JyProjectExecutionListener.java

@@ -3,6 +3,8 @@ package com.jeeplus.modules.flowable.listener;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -77,18 +79,21 @@ public class JyProjectExecutionListener implements ExecutionListener {
                 UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(flow.getAssigneeId());
                 //获取到岗位为办公室下的人员信息
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("办公室");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                String finalTitleName = titleName;
-                listByPostId.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    String finalTitleName = titleName;
+                    listByPostId.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/JyUseSealListener.java

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -73,18 +75,21 @@ public class JyUseSealListener implements ExecutionListener {
                 UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(flow.getAssigneeId());
                 //获取到岗位为办公室下的人员信息
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("印章管理员");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                String finalTitleName = titleName;
-                listByPostId.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if(ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    String finalTitleName = titleName;
+                    listByPostId.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/PurchaseApplyListener.java

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -76,19 +78,22 @@ public class PurchaseApplyListener implements ExecutionListener {
 
 
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("物品管理员");
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
-                String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                    String finalTitleName = titleName;
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/RegularApplyListener.java

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.flowable.listener;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -75,10 +77,15 @@ public class RegularApplyListener implements ExecutionListener {
 
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("财务");
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("人事部");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                userDTOS.addAll(listByPostId);
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
+                if (ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    userDTOS.addAll(listByPostId);
+                }
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                }
+
                 String finalTitleName = titleName;
                 userDTOS.stream().forEach(item->{
                     FlowCopy flowCopy = new FlowCopy();

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/UseCarListener.java

@@ -1,6 +1,9 @@
 package com.jeeplus.modules.flowable.listener;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jeeplus.extension.domain.FlowCopy;
 import com.jeeplus.extension.service.FlowCopyService;
 import com.jeeplus.flowable.model.ActRuTaskInfo;
@@ -74,22 +77,31 @@ public class UseCarListener implements ExecutionListener {
                 //获取到岗位为总经理和驾驶员的人员信息
                 ArrayList<UserDTO> userDTOS = new ArrayList<>();
                 PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("驾驶员");
-                List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
-                userDTOS.addAll(listByPostId);
+                if (ObjectUtils.isNotEmpty(postDTOByName) && StringUtils.isNotBlank(postDTOByName.getId())){
+                    List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
+                    userDTOS.addAll(listByPostId);
+                }
+
                 PostDTO postDTOByName1 = SpringUtil.getBean(IPostApi.class).getPostDTOByName("总经理");
-                List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
-                userDTOS.addAll(listByPostId1);
+                if (ObjectUtils.isNotEmpty(postDTOByName1) && StringUtils.isNotBlank(postDTOByName1.getId())){
+                    List<UserDTO> listByPostId1 = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName1.getId());
+                    userDTOS.addAll(listByPostId1);
+                }
+
                 String finalTitleName = titleName;
-                userDTOS.stream().forEach(item->{
-                    FlowCopy flowCopy = new FlowCopy();
-                    flowCopy.setProcDefId(task.getProcDefId());
+                if (CollectionUtil.isNotEmpty(userDTOS)){
+                    userDTOS.stream().forEach(item->{
+                        FlowCopy flowCopy = new FlowCopy();
+                        flowCopy.setProcDefId(task.getProcDefId());
 //                        flowCopy.setProcDefId(task.getProcDefId());
-                    flowCopy.setProcInsName(finalTitleName);
-                    flowCopy.setProcInsId(task.getProcInstId());
-                    flowCopy.setUserId(item.getId());
-                    SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+                        flowCopy.setProcInsName(finalTitleName);
+                        flowCopy.setProcInsId(task.getProcInstId());
+                        flowCopy.setUserId(item.getId());
+                        SpringUtil.getBean(FlowCopyService.class).save(flowCopy);
+
+                    });
+                }
 
-                });
 
 
             }