From ebc71b6a8a8d42f8fac9393ddd6584ddb4c1abc6 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 11 Nov 2024 10:59:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20suzhoubank=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=B6=89=E5=8F=8A=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1282565443387392]suzhoubank模块涉及表单数据解析代码逻辑修改 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1282565443387392 --- .../module/process/api/process/ProcessConditionList.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java index aa49601b6..4e99acd21 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java @@ -61,6 +61,7 @@ public class ProcessConditionList extends PrivateApiComponentBase { @Description(desc = "nmpap.processconditionlist.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { + System.out.println("process/condition/lis = " + jsonObj); JSONArray resultArray = new JSONArray(); Integer isAll = jsonObj.getInteger("isAll"); // 固定字段条件 @@ -144,6 +145,14 @@ public class ProcessConditionList extends PrivateApiComponentBase { } } } + ConditionParamVo conditionParamVo = new ConditionParamVo(); + conditionParamVo.setName("a"); + conditionParamVo.setLabel("A"); + conditionParamVo.setController(""); + conditionParamVo.setType(""); + conditionParamVo.setHandler(""); + conditionParamVo.setConfig(""); + resultArray.add(conditionParamVo); return resultArray; } } -- Gitee From d0d3038185904952fcffa7ce141fd451a62eb4f7 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 11 Nov 2024 14:27:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1287637623603200]IT服务-修改工单关注人权限校验逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1287637623603200 --- .../handler/TaskOperateHandler.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java index 5f993f228..95e060c43 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java @@ -862,13 +862,7 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { if (SystemUser.SYSTEM.getUserUuid().equals(userUuid)) { return true; } - //3.判断当前用户是否有“工单管理权限”，如果没有，则提示“没有工单管理权限”； - if (!AuthActionChecker.checkByUserUuid(userUuid, PROCESSTASK_MODIFY.class.getSimpleName())) { - operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) - .put(operationType, new ProcessTaskNotProcessTaskModifyException()); - return false; - } - //4.依次判断当前用户是否是工单上报人、代报人、处理人、待处理人，如果都不是，则提示“您不是工单干系人”； + //3.依次判断当前用户是否是工单上报人、代报人、处理人、待处理人，如果都不是，则提示“您不是工单干系人”； if (userUuid.equals(processTaskVo.getOwner())) { return true; } else if (userUuid.equals(processTaskVo.getReporter())) { @@ -878,9 +872,14 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { } else if (checkIsWorker(processTaskVo, userUuid)) { return true; } - operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) - .put(operationType, new ProcessTaskNotProcessUserException()); - return false; + + //4.判断当前用户是否有“工单管理权限”，如果没有，则提示“没有工单管理权限”； + if (!AuthActionChecker.checkByUserUuid(userUuid, PROCESSTASK_MODIFY.class.getSimpleName())) { + operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) + .put(operationType, new ProcessTaskNotProcessTaskModifyException()); + return false; + } + return true; }); } -- Gitee From edbd748c6f58da6399bc0088ffe7061b57e2b60b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 11 Nov 2024 14:29:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1287637623603200]IT服务-修改工单关注人权限校验逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1287637623603200 --- .../module/process/api/process/ProcessConditionList.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java index 4e99acd21..aa49601b6 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java @@ -61,7 +61,6 @@ public class ProcessConditionList extends PrivateApiComponentBase { @Description(desc = "nmpap.processconditionlist.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { - System.out.println("process/condition/lis = " + jsonObj); JSONArray resultArray = new JSONArray(); Integer isAll = jsonObj.getInteger("isAll"); // 固定字段条件 @@ -145,14 +144,6 @@ public class ProcessConditionList extends PrivateApiComponentBase { } } } - ConditionParamVo conditionParamVo = new ConditionParamVo(); - conditionParamVo.setName("a"); - conditionParamVo.setLabel("A"); - conditionParamVo.setController(""); - conditionParamVo.setType(""); - conditionParamVo.setHandler(""); - conditionParamVo.setConfig(""); - resultArray.add(conditionParamVo); return resultArray; } } -- Gitee