From 43881b113c83ea12af22321a846c55930e710b46 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sun, 4 Feb 2024 09:55:01 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A4=E6=96=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=A7=92=E8=89=B2=E4=BD=BF=E7=94=A8loginUser=E7=9A=84?= =?UTF-8?q?isAdmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/activiti/service/ProcessAllService.java | 5 ++--- .../controller/LawsEvaluationNotMetController.java | 2 +- .../service/impl/LawsEvaluationNotMetServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 6fb942c9..e3ab2d2c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -298,10 +298,9 @@ public class ProcessAllService extends ServiceImpl .map(ProcessApprovalRecord::getUserId) .distinct() .collect(Collectors.toList()); - String loginUserId = CurrentUserUtil.getId(); - String roleIds = CurrentUserUtil.getRoles(); + LoginUser loginUser = CurrentUserUtil.getLoginUser(); //管理员和当前流程中人员可以催办 - if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !canUrgingUserList.contains(loginUserId)){ + if (!loginUser.getIsAdmin() && !canUrgingUserList.contains(loginUser.getId())){ throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java index c04b42b4..cebf910b 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java @@ -130,7 +130,7 @@ public class LawsEvaluationNotMetController extends JeroController notMets = lawsEvaluationNotMetService.listByIds(ids); for (LawsEvaluationNotMet notMet : notMets) { //管理员和设计工程师可以操作未符合项 - if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !userId.equals(notMet.getEngineerId())){ + if (!loginUser.getIsAdmin() && !userId.equals(notMet.getEngineerId())){ throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT); } String state = notMet.getState(); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index 0fbd2802..6f1c6c38 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -198,7 +198,7 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl