mitao
2025-04-02 e4d449b18083e45d9b808ec0350deaec1ced88a2
Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
1个文件已修改
11 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -235,7 +235,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)
@@ -268,12 +269,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 (accountLevel.compareTo(one.getReportType()) == 0 && identity != 5 && 1 == isAdmin) {
                        if (accountLevel.compareTo(one.getReportType()) == 0) {
                            vo.setListControlsButtonStatus(0);
                        }
                    }
@@ -343,8 +343,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: