From cb7e1b27c09e6a4348344caf87169466976d6688 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Mar 2024 10:59:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2082879=20=E5=B7=A5=E4=BD=9C=E7=BB=84&?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84--=E9=9D=9E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=A7=92=E8=89=B2--=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E4=BA=86=E9=9D=9E=E8=87=AA=E5=B7=B1=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDraftingGroupController.java | 16 +++++++++++----- .../controller/PayWorkingGroupController.java | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) 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 11ba304e..6e4ff7be 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; @@ -16,6 +17,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.mail.commont.constant; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.service.IPayWorkingGroupService; @@ -73,13 +75,17 @@ public class PayDraftingGroupController extends JeroController 50){ return Result.error("起草组项目长度不能大于50个字符"); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(!rolePermissionService.getRolePermission("draftingGroup:search")){ - payDraftingGroup.setPrincipalA(sysUser.getId()); - payDraftingGroup.setPrincipalB(sysUser.getId()); + if (StringUtils.isNotBlank(sysUser.getRoleCode())){ + List roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); + if(rolePermissionService.getRolePermission("draftingGroup:search") && + !(roleCodes.contains(constant.ADMIN))){ + payDraftingGroup.setPrincipalA(sysUser.getId()); + payDraftingGroup.setPrincipalB(sysUser.getId()); + } + } else { + throw new JeroBootException("登录用户角色为空！"); } - // 分页条件查询 Page page = new Page<>(pageNo, pageSize); if(!StringUtils.isBlank(payDraftingGroup.getDraftingGroupProject())){ 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 9c3c722a..65b088dc 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 @@ -16,6 +16,8 @@ import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.mail.commont.constant; +import com.jero.meeting.entity.PayMeetingQuestion; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -37,6 +39,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -80,9 +83,15 @@ public class PayWorkingGroupController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); + if(rolePermissionService.getRolePermission("workingGroupProject:search") && + !(roleCodes.contains(constant.ADMIN))){ + payWorkingGroup.setPrincipalA(sysUser.getId()); + payWorkingGroup.setPrincipalB(sysUser.getId()); + } + } else { + throw new JeroBootException("登录用户角色为空！"); } Page page = new Page(pageNo, pageSize); if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject())){