From f0258bb965bcb5ef40e513c235e950f9a861ef10 Mon Sep 17 00:00:00 2001 From: lwd <466279616@qq.com> Date: Mon, 5 Jan 2026 15:37:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=A5=E9=87=8D=E8=BF=9D?= =?UTF-8?q?=E6=B3=95=E5=BC=82=E8=AE=AE=E6=B5=81=E7=A8=8B=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9B2.=E4=BF=AE=E5=A4=8D=E6=96=87=E4=B9=A6=E7=A9=97?= =?UTF-8?q?=E5=AD=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkFlowServiceImpl.java | 6 ++++-- .../inspect/service/impl/TSWorkNoServiceImpl.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) 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 = "";