已处理 加taskId

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java

@@ -72,15 +72,17 @@ public class WithDrawHandle {
     // 判断当前操作人 是上一个节点的审批人
     public Boolean checkUserIsBefore(List<ProgressNode> currentProgressInfo, ReqProcessHandlerDTO param) {
         UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId());
-        //1.判断出 当前审批人和上一个审批人
-        ProgressNode progressNode = currentProgressInfo.get(currentProgressInfo.size() - 1);
-        ProgressNode beforeProgressNode = null;
-        ProgressNode currentProgressNode = null;
 
         // 先排除掉抄送任务节点
         currentProgressInfo = currentProgressInfo.stream()
                 .filter(c -> !NodeTypeEnum.CC.name().equals(c.getNodeType().name()))
                 .collect(Collectors.toList());
+
+        //1.判断出 当前审批人和上一个审批人
+        ProgressNode progressNode = currentProgressInfo.get(currentProgressInfo.size() - 1);
+        ProgressNode beforeProgressNode = null;
+        ProgressNode currentProgressNode = null;
+
         if (CollUtil.isEmpty(currentProgressInfo)){
             return Boolean.FALSE;
         }
@@ -108,7 +110,7 @@ public class WithDrawHandle {
         // 判断当前工作流任务前一个审核人的部门和当前登录用户的部门是否是同一个，如果是同一个才可以撤回，否则抛出异常
         // 获取当前当前工作流任务当前审核人信息
         UserFullInfoDTO currentUserInfo = userInfoHelper.getUserFullInfoByEmployeeCode(currentProgressNode.getUserId());
-        if(!currentUserInfo.getEmpPosUnitCode().equals(user.getEmpPosUnitCode())){
+        if(Objects.isNull(currentUserInfo) || !currentUserInfo.getEmpPosUnitCode().equals(user.getEmpPosUnitCode())){
             return Boolean.FALSE;
         }
 

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -550,6 +550,7 @@ public class TodoCenterManage {
             res.setProcessStatusName(d.getStatus());
             res.setProcessLaunchTime(d.getCreateTime());
             res.setProcessHandleTime(d.getTaskEndTime());
+            res.setTaskId(d.getTaskId());
             return res;
         }).collect(Collectors.toList());
         return PageVo.of(resVos, iDoList.size());