Browse Source

普通报销,差旅报销工作流修改加经理事件

chenjun 1 năm trước cách đây
mục cha
commit
265e59a5b2

+ 1 - 2
zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/event/CommonCostEvent.java

@@ -328,8 +328,7 @@ public class CommonCostEvent extends BaseController {
             CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
             List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
             Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
-            postCodes.remove("jmfzr");
-            if (entity != null && CollectionUtil.contains(postCodes, "bmjl")) {
+            if (entity != null && CollectionUtil.contains(postCodes, "bmjl") && !CollectionUtil.contains(postCodes, "jmfzr")) {
                 return "true";
             }
             return "false";

+ 1 - 2
zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/event/TravelCostEvent.java

@@ -268,8 +268,7 @@ public class TravelCostEvent extends BaseController {
             TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
             List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
             Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
-            postCodes.remove("jmfzr");
-            if (entity != null && CollectionUtil.contains(postCodes, "bmjl")) {
+            if (entity != null && CollectionUtil.contains(postCodes, "bmjl") && !CollectionUtil.contains(postCodes, "jmfzr")) {
                 return "true";
             }
             return "false";