diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/WorkFlowServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/WorkFlowServiceImpl.java index 4590135..33f18d5 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/WorkFlowServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/WorkFlowServiceImpl.java @@ -182,8 +182,10 @@ public class WorkFlowServiceImpl implements WorkFlowService { @Override public ResultMap completeTaskToOther(String processid, String nextNodeID, List nextUserIDs) { boolean isEnd = false; - if (nextUserIDs == null || nextUserIDs.size() == 0) { - throw new BusinessException("nextUserIDs为空,请检查。processid=" + processid); + if (!"endDissent".equals(nextNodeID)) { + if (nextUserIDs == null || nextUserIDs.size() == 0) { + throw new BusinessException("nextUserIDs为空,请检查。processid=" + processid); + } } int flag = nextUserIDs.size() == 1 ? FLAG_SINGLE : FLAG_MULTI; diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java index 3b6b7f5..08fcec1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java @@ -43,13 +43,14 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl map = Constant.GZ_REGION_CODE_SHORTNAME; - String shortName = "穗"; - for (String code : map.keySet()) { - if (code.equals(aicID) && !map.get(code).equals("穗")) { - shortName += map.get(code); - break; - } - } + String shortName = map.get(aicID.substring(0, 4) + "00"); +// String shortName = "穗"; +// for (String code : map.keySet()) { +// if (code.equals(aicID) && !map.get(code).equals("穗")) { +// shortName += map.get(code); +// break; +// } +// } paramModel.setAicid(aicID.length() > 6 ? aicID.substring(0, 6) : aicID); paramModel.setWorkNoType(workNoType); String genRule = "";