bug修改

mitao

2025-03-18 710a0fc7212b90c1d53d027bd2ec78fafcc16489

bug修改

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
@@ -34,6 +35,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.connection.RedisServer;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -71,6 +73,7 @@
    private final HttpServletResponse response;
    private final IPartyMemberService partyMemberService;
    private final IdentityInformationService identityInformationService;
    private final RedisUtils redisUtils;

    @Override
    public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
@@ -232,7 +235,8 @@
        vo.setListControlsButtonStatus(1);
        vo.setEvaluateButtonStatus(1);
        vo.setAuditButtonStatus(1);

        // 获取身份
        Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
        ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
//                .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -244,8 +248,12 @@
                SystemUser systemUser = systemUserByPhone.get();
                Integer accountLevel = systemUser.getAccountLevel();
                Integer isAdmin = systemUser.getIsAdmin();
                //非党员用户，必须是管理员有权限
                if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                //当前身份是管理员
                if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
                    vo.setListControlsButtonStatus(0);
                }
                //如果当前身份是党员
                if(1 == identity && 5 == vo.getReportType()){
                    vo.setListControlsButtonStatus(0);
                }
            } else {
@@ -256,8 +264,6 @@
        }
        //有审核数据，且正在办理
        if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {


            //区分是上报数据还是下派数据
            if (one.getAuditType() == 2 || one.getAuditType() == 1) {
                //判断当前审核状态
@@ -296,8 +302,12 @@
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                            //当前身份是管理员
                            if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
                                vo.setListControlsButtonStatus(0);
                            }
                            //如果当前身份是党员
                            if(1 == identity && 5 == vo.getReportType()){
                                vo.setListControlsButtonStatus(0);
                            }
                        } else {
@@ -319,46 +329,8 @@
                        Integer accountLevel = systemUser.getAccountLevel();
                        Integer isAdmin = systemUser.getIsAdmin();
                        //非党员用户，必须是管理员有权限
                        if (accountLevel.compareTo(one.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                        if (accountLevel.compareTo(one.getReportType()) == 0 && 1 == isAdmin && 2 == identity) {
                            vo.setListControlsButtonStatus(0);
                        }
                    } else {
                        if (vo.getReportType() == 5 && one.getReportType() == 5) {
                            vo.setListControlsButtonStatus(0);
                        }
                    }
                } else {
                    //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 3).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
                    if (null != one1) {
                        if (systemUserByPhone.isPresent()) {
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if (accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                                vo.setListControlsButtonStatus(0);
                            }
                        } else {
                            if (vo.getReportType() == 5 && one1.getReportType() == 5) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    } else {
                        //没有上一层审核通过的数据，则权限给到添加人
                        if (systemUserByPhone.isPresent()) {
                            SystemUser systemUser = systemUserByPhone.get();
                            Integer accountLevel = systemUser.getAccountLevel();
                            Integer isAdmin = systemUser.getIsAdmin();
                            //非党员用户，必须是管理员有权限
                            if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                                vo.setListControlsButtonStatus(0);
                            }
                        } else {
                            if (vo.getReportType() == 5) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }
                }
@@ -417,7 +389,12 @@
                SystemUser systemUser = systemUserByPhone.get();
                Integer accountLevel = systemUser.getAccountLevel();
                Integer isAdmin = systemUser.getIsAdmin();
                if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                //当前不是党员身份，需要是管理员才有权限
                if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
                    vo.setEvaluateButtonStatus(0);
                }
                //当前是党员身份，只有是以党员身份提交的数据才有权限
                if(1 == identity && vo.getReportType() == 5){
                    vo.setEvaluateButtonStatus(0);
                }
            } else {