From e14730d1349a9eab26ba030bad3e042c1c4d3130 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 2 Apr 2024 14:09:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=8E=BB=E9=99=A4=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/service/impl/RolePermissionServiceImpl.java | 3 +++ .../com/jero/project/controller/PayWorkingGroupController.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/RolePermissionServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/RolePermissionServiceImpl.java index eb69e35c..cb0c41ab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/RolePermissionServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/RolePermissionServiceImpl.java @@ -44,6 +44,9 @@ public class RolePermissionServiceImpl implements RolePermissionService { } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List list = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); + if(list.contains(RoleCommon.XMFZR)){ + list.remove(RoleCommon.XMFZR); + } if(!CollectionUtils.isEmpty(list)){ LambdaQueryWrapper querySysRole = new LambdaQueryWrapper<>(); querySysRole.in(SysRole::getRoleCode,list); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 65b088dc..47fbf262 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -85,8 +85,7 @@ public class PayWorkingGroupController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); - if(rolePermissionService.getRolePermission("workingGroupProject:search") && - !(roleCodes.contains(constant.ADMIN))){ + if(!roleCodes.contains(constant.ADMIN)){ payWorkingGroup.setPrincipalA(sysUser.getId()); payWorkingGroup.setPrincipalB(sysUser.getId()); }