Merge remote-tracking branch 'origin/master'

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

@@ -344,8 +344,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("sj");
-            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "user"))) {
+            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "user")) && !CollectionUtil.contains(postCodes, "sj")) {
                 return "true";
             }
             return "false";

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

@@ -300,8 +300,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("sj");
-            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "user"))) {
+            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "user")) && !CollectionUtil.contains(postCodes, "sj")) {
                 return "true";
             }
             return "false";