迭代：4.11版本

luofl

2025-04-14 6718c3b53e6f5d5fae16f9f01af03771405836c5

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -252,13 +252,16 @@
        //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
        page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);

        page.getRecords().forEach(s -> {
        for (ComplaintVO s : page.getRecords()) {
            buttonPermission(s, systemUserByPhone, loginUserInfoVO);
            Integer auditButtonStatus = s.getAuditButtonStatus();
            if (auditButtonStatus == 1 && s.getStatus() == 5 && !Objects.equals(s.getAuditCreateBy(), loginUserInfoVO.getUserId())){

            Long reporterId = s.getReporterId();
            Long superiorId = s.getSuperiorId2();
            if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
                s.setStatus(0);
            }
        });
        }
        return page;
    }

@@ -285,11 +288,11 @@
                Integer accountLevel = systemUser.getAccountLevel();
                Integer isAdmin = systemUser.getIsAdmin();
                //当前身份是管理员
                if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
                if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
                    vo.setListControlsButtonStatus(0);
                }
                //如果当前身份是党员
                if(1 == identity && 5 == vo.getReportType()){
                if (1 == identity && 5 == vo.getReportType()) {
                    vo.setListControlsButtonStatus(0);
                }
            } else {
@@ -338,11 +341,11 @@
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //当前身份是管理员
                            if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
                            if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
                                vo.setListControlsButtonStatus(0);
                            }
                            //如果当前身份是党员
                            if(1 == identity && 5 == vo.getReportType()){
                            if (1 == identity && 5 == vo.getReportType()) {
                                vo.setListControlsButtonStatus(0);
                            }
                        } else {
@@ -428,7 +431,7 @@
                    vo.setEvaluateButtonStatus(0);
                }
                //当前是党员身份，只有是以党员身份提交的数据才有权限
                if(1 == identity && vo.getReportType() == 5){
                if (1 == identity && vo.getReportType() == 5) {
                    vo.setEvaluateButtonStatus(0);
                }
            } else {
@@ -442,7 +445,7 @@
        Long userId = loginUserInfo.getUserId();
        if (null != auditCreateBy && auditCreateBy.compareTo(userId) == 0 && vo.getStatus() == 5) {
            vo.setWithdrawButtonStatus(0);
        }else {
        } else {
            vo.setWithdrawButtonStatus(1);
        }

@@ -505,23 +508,21 @@
        List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
                .orderByAsc(ComplaintProgress::getCreateTime).list();
        detail.setComplaintProgresses(list);
//        detail.setAuditButtonStatus(1);
//        detail.setEvaluateButtonStatus(1);
//        if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
//            ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
//                    .eq(ComplaintAuditRecord::getLatestFlag, 1));
//            Integer isAdmin = systemUserByPhone.get().getIsAdmin();
//            if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
//                detail.setAuditButtonStatus(0);
//            }
//        }


        buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
        Integer auditButtonStatus = detail.getAuditButtonStatus();
        if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
        Long reporterId = detail.getReporterId();
        Long superiorId = detail.getSuperiorId2();
        if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5) {
            detail.setStatus(0);
        }


//        if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
//            detail.setStatus(0);
//        }




//        //已办结，显示评价按钮
@@ -562,8 +563,8 @@
        if (identityInformationVO.getIdentity() == 2) {
            //1=党员，2=管理员
            SystemUser systemUser = identityInformationVO.getSystemUser();
            name =   systemUser.getName();
        }else if (identityInformationVO.getIdentity() == 1){
            name = systemUser.getName();
        } else if (identityInformationVO.getIdentity() == 1) {
            PartyMember partyMember = identityInformationVO.getPartyMember();
            name = partyMember.getName();
        }
@@ -596,8 +597,8 @@
            //1=党员，2=管理员
            SystemUser systemUser = identityInformationVO.getSystemUser();
            accountLevel = systemUser.getAccountLevel();
            name =   systemUser.getName();
        }else if (identityInformationVO.getIdentity() == 1){
            name = systemUser.getName();
        } else if (identityInformationVO.getIdentity() == 1) {
            accountLevel = 5;
            PartyMember partyMember = identityInformationVO.getPartyMember();
            name = partyMember.getName();
@@ -624,7 +625,6 @@
        return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
                .orderByAsc(ComplaintProgress::getCreateTime).list();
    }



    @Override