From 838594aaee4272b6813af072775f9a894f82d7b0 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期三, 02 四月 2025 16:10:05 +0800 Subject: [PATCH] 修改按钮权限 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java index 57901cc..6a87ced 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java @@ -238,7 +238,8 @@ vo.setEvaluateButtonStatus(1); vo.setAuditButtonStatus(1); // 获取身份 - Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone()); + IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo); + Integer identity = currentIdentityInformation.getIdentity(); ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>() .eq(ComplaintAuditRecord::getComplaintId, vo.getId()) // .ne(ComplaintAuditRecord::getAuditType, 1) @@ -271,11 +272,11 @@ //判断当前审核状态 if (one.getAuditStatus() == 1) { //审核状态为通过,则权限给到上报审核的这一层 - if (systemUserByPhone.isPresent()) { + if (systemUserByPhone.isPresent() && identity == 2) { SystemUser systemUser = systemUserByPhone.get(); - Integer isAdmin = systemUser.getIsAdmin(); + Integer accountLevel = systemUser.getAccountLevel(); //非党员用户,必须是管理员有权限 - if (identity.compareTo(one.getReportType()) == 0 && identity != 5 && 1 == isAdmin) { + if (accountLevel.compareTo(one.getReportType()) == 0) { vo.setListControlsButtonStatus(0); } } @@ -345,8 +346,7 @@ String targetId = ""; Integer accountLevel = 5; //获取当前身份,1=党员,2=管理员 - IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo); - if (2 == identityInformation.getIdentity()) { + if (2 == currentIdentityInformation.getIdentity()) { accountLevel = systemUser.getAccountLevel(); switch (accountLevel) { case 1: @@ -981,7 +981,7 @@ List<DispatchVO> dispatchVOList = new ArrayList<>(); if (accountLevel == ReportTypeEnum.STREET.getCode()) { String streetId = adminUser.getStreetId(); - List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0)); + List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId)); for (ComAct comAct : list) { DispatchVO dispatchVO = new DispatchVO(); dispatchVO.setId(comAct.getCommunityId().toString()); -- Gitblit v1.7.1