diff --git a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java index 026858a..706a6e8 100644 --- a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java +++ b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java @@ -171,18 +171,25 @@ public class AdminSealManagementController implements AdminSealManagementApi { JSONObject ext = req.getSealBody(); List sealType = ext.containsKey("sealType") ? ext .getObject("sealType", List.class) : null; - if (sealType != null && sealType.size() > 0) { - Integer stampType = sealType.get(0); - switch (stampType) { - case 18: //法人章(借) - case 28: //法人身份证 - type= activitiEnum.activitiType.borrowMethod; - break; - default: - type = activitiEnum.activitiType.borrow; +// if (sealType != null && sealType.size() > 0) { +// Integer stampType = sealType.get(0); +// switch (stampType) { +// case 18: //法人章(借) +// case 28: //法人身份证 +// type= activitiEnum.activitiType.borrowMethod; +// break; +// default: +// type = activitiEnum.activitiType.borrow; +// break; +// } +// } + for (Integer i : sealType) { + if(i==18||i==28){ //法人章(借)、法人身份证到所长(借章管理) + type= activitiEnum.activitiType.borrowMethod; //流程图所长节点前面增加副所长节点 break; } } + if(type==null)type = activitiEnum.activitiType.borrow; // type = activitiEnum.activitiType.borrow; } } else { diff --git a/src/main/resources/processes/borrowMethod.bpmn b/src/main/resources/processes/borrowMethod.bpmn index 9d8e3b0..48604ff 100644 --- a/src/main/resources/processes/borrowMethod.bpmn +++ b/src/main/resources/processes/borrowMethod.bpmn @@ -1,5 +1,5 @@ - + @@ -12,11 +12,13 @@ + SequenceFlow_0d78n8w + SequenceFlow_1o74bdn @@ -26,7 +28,15 @@ - + + + + + SequenceFlow_0d78n8w + SequenceFlow_1o74bdn + + + @@ -86,13 +96,6 @@ - - - - - - - @@ -100,6 +103,18 @@ + + + + + + + + + + + +