diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java index 5d73b0ae..59e8bbc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java @@ -78,7 +78,8 @@ public class PayDraftingGroupController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); - if (!(roleCodes.contains(constant.ADMIN))) { + //管理员和财务查询全部,其余角色查询自己的 + if(!roleCodes.contains(constant.ADMIN)&&!roleCodes.contains(constant.CWRY)){ payDraftingGroup.setPrincipalA(sysUser.getId()); payDraftingGroup.setPrincipalB(sysUser.getId()); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java index eebed69c..4f7d8b8f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java @@ -24,6 +24,10 @@ public interface constant { */ public static final String SLD="sld"; + /** + * 财务 + */ + public static final String CWRY="cwry"; /** * 超级管理员 */ 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 47fbf262..efc929eb 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,7 +85,8 @@ public class PayWorkingGroupController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); - if(!roleCodes.contains(constant.ADMIN)){ + //管理员和财务查询全部,其余角色查询自己的 + if(!roleCodes.contains(constant.ADMIN)&&!roleCodes.contains(constant.CWRY)){ payWorkingGroup.setPrincipalA(sysUser.getId()); payWorkingGroup.setPrincipalB(sysUser.getId()); }