自定义流程接口新增

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -2294,24 +2294,24 @@ public class ActivitiServiceImpl implements ActivitiService {
         if (Objects.nonNull(tfFlowLogResultList) && tfFlowLogResultList.size() > 0) {
             List<TFFlowViewLogResult> flowViewTaskResultList = gson.fromJson(gson.toJson(tfFlowLogResultList), new TypeToken<List<TFFlowViewLogResult>>() {
             }.getType());
-            if (Objects.nonNull(currFlowTaskResult) && currFlowTaskResult.getSetup() <= 0) {
-                return new FlowViewResult(currFlowTaskResult, flowViewTaskResultList);
-            } else if (Objects.nonNull(currFlowTaskResult)) {
-                CustomFlowVarDto customFlowVarDto = gson.fromJson(gson.toJson(agginessMap.get(currFlowTaskResult.getTaskKey())), CustomFlowVarDto.class);
-                String nextApproveUsers = flowViewTaskResultList.get(flowViewTaskResultList.size() - 1).getPendApproveUserName();
-                if (Objects.nonNull(customFlowVarDto.getMultipleUserApproveType()) && customFlowVarDto.getMultipleUserApproveType() == CustomFlowMultipleUserApproveTypeEnum.ORDER) {
-                    String[] strs = nextApproveUsers.split(",");
-                    nextApproveUsers = strs[0];
-                    currFlowTaskResult.setApproveUserNames(nextApproveUsers);
+            if (Objects.nonNull(currFlowTaskResult)) {
+                if (currFlowTaskResult.getSetup() <= 0) {
+                    return new FlowViewResult(currFlowTaskResult, flowViewTaskResultList);
                 } else {
-                    currFlowTaskResult.setApproveUserNames(customFlowVarDto.getApproveUserNames());
+                    CustomFlowVarDto customFlowVarDto = gson.fromJson(gson.toJson(agginessMap.get(currFlowTaskResult.getTaskKey())), CustomFlowVarDto.class);
+                    String nextApproveUsers = flowViewTaskResultList.get(flowViewTaskResultList.size() - 1).getPendApproveUserName();
+                    if (Objects.nonNull(customFlowVarDto.getMultipleUserApproveType()) && customFlowVarDto.getMultipleUserApproveType() == CustomFlowMultipleUserApproveTypeEnum.ORDER) {
+                        String[] strs = nextApproveUsers.split(",");
+                        nextApproveUsers = strs[0];
+                        currFlowTaskResult.setApproveUserNames(nextApproveUsers);
+                    } else {
+                        currFlowTaskResult.setApproveUserNames(customFlowVarDto.getApproveUserNames());
+                    }
+                    return new FlowViewResult(customFlowVarDto.getMultipleUserApproveType(), currFlowTaskResult, flowViewTaskResultList);
                 }
-                return new FlowViewResult(customFlowVarDto.getMultipleUserApproveType(), currFlowTaskResult, flowViewTaskResultList);
             }
-        } else {
-            return new FlowViewResult(currFlowTaskResult);
         }
-        return null;
+        return new FlowViewResult(currFlowTaskResult);
     }
 
     /**