Browse Source

撤回审批

guarantee-lsq 7 months ago
parent
commit
ca2bdd054b

+ 1 - 1
platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowServiceImpl.java

@@ -125,7 +125,7 @@ public class WorkflowServiceImpl extends BaseServiceImpl<WorkflowMapper, Workflo
                 case CommonConstants.CONDITION_TYPE: // 条件分支
                     JSONObject condition = new JSONObject();
                     condition.put("value", jsonObject.getString("handleConditionValue"));
-                    condition.put("symbol", jsonObject.getString("handleConditionType"));
+                    condition.put("symbol", jsonObject.getString("handleCondition"));
                     condition.put("fieldName",jsonObject.getString("titleColumnCode"));
                     node.setSwitchJson(condition.toJSONString());
                     node.setSwitchHandleId(jsonObject.getString("handleNameId"));

+ 3 - 0
platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowTaskBomServiceImpl.java

@@ -149,6 +149,9 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
         WorkflowTaskBom updBom = new WorkflowTaskBom();
         updBom.setId(id);
         WorkflowTaskBom insertBom = generateTaskBom(nodeList,updTask,updBom,data);
+        if(insertBom == null){
+            throw new DeniedException("审批动态任务生成失败");
+        }
         // 存入bom
         mapper.insert(insertBom);
         // 修改老节点