bug修改

luofl

2025-03-18 0df5505f512752a96553fceafea6bc206d28ca74

bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/ServiceDlzApplication.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/controller/CommonController.class

Binary files differ

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

@@ -148,7 +148,7 @@
                    complaint.setReportUserPhone(partyMember.getPhone());
                    break;
            }
        } else{
        } else {
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
            //党员
            complaint.setCityCode(510400);
@@ -185,7 +185,7 @@
        Integer accountLevel = 5;
        //获取当前身份，1=党员，2=管理员
        IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
        if (CollectionUtil.isEmpty(identityInformation.getPermissions())){
        if (CollectionUtil.isEmpty(identityInformation.getPermissions())) {
            throw new ServiceException("请先完善个人信息");
        }
        Integer identity = identityInformation.getIdentity();
@@ -224,134 +224,134 @@
        //查询对应诉求
        //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
        page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
        page.getRecords().forEach(s-> buttonPermission(s, systemUserByPhone, loginUserInfoVO));
        page.getRecords().forEach(s -> buttonPermission(s, systemUserByPhone, loginUserInfoVO));
        return page;
    }
    
    


    /**
     * 列表按钮权限
     */
    public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone, LoginUserInfoVO loginUserInfo){
    public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone, LoginUserInfoVO loginUserInfo) {
        vo.setListControlsButtonStatus(1);
        vo.setEvaluateButtonStatus(1);
        vo.setAuditButtonStatus(1);
        

        ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                .ne(ComplaintAuditRecord::getAuditType, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
        //没有审核数据，且正在办理，则按钮权限是添加人员的
        if(null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)){
            if(systemUserByPhone.isPresent()){
        if (null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)) {
            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)){
                if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                    vo.setListControlsButtonStatus(0);
                }
            }else{
                if(vo.getReportType() == 5){
            } else {
                if (vo.getReportType() == 5) {
                    vo.setListControlsButtonStatus(0);
                }
            }
        }
        //有审核数据，且正在办理
        if(null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)){
        if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {
            //区分是上报数据还是下派数据
            if(one.getAuditType() == 2){
            if (one.getAuditType() == 2) {
                //判断当前审核状态
                if(one.getAuditStatus() == 1){
                if (one.getAuditStatus() == 1) {
                    //审核状态为通过，则权限给到上报审核的这一层
                    if(systemUserByPhone.isPresent()){
                    if (systemUserByPhone.isPresent()) {
                        SystemUser systemUser = systemUserByPhone.get();
                        Integer accountLevel = systemUser.getAccountLevel();
                        Integer isAdmin = systemUser.getIsAdmin();
                        //非党员用户，必须是管理员有权限
                        if(accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin){
                        if (accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
                            vo.setListControlsButtonStatus(0);
                        }
                    }
                }else{
                } else {
                    //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 2).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
                    if(null != one1){
                        if(systemUserByPhone.isPresent()){
                    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){
                            if (accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }else{
                    } else {
                        //没有上一层审核通过的数据，则权限给到添加人
                        if(systemUserByPhone.isPresent()){
                        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)){
                            if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5){
                        } else {
                            if (vo.getReportType() == 5) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }
                }
            }
            

            //下派数据
            if(one.getAuditType() == 3){
            if (one.getAuditType() == 3) {
                //判断当前审核状态
                if(one.getAuditStatus() == 1){
                if (one.getAuditStatus() == 1) {
                    //审核状态为通过，则权限给到下报审核的这一层
                    if(systemUserByPhone.isPresent()){
                    if (systemUserByPhone.isPresent()) {
                        SystemUser systemUser = systemUserByPhone.get();
                        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 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                            vo.setListControlsButtonStatus(0);
                        }
                    }else{
                        if(vo.getReportType() == 5 && one.getReportType() == 5){
                    } else {
                        if (vo.getReportType() == 5 && one.getReportType() == 5) {
                            vo.setListControlsButtonStatus(0);
                        }
                    }
                }else{
                } 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()){
                    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)){
                            if (accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5 && one1.getReportType() == 5){
                        } else {
                            if (vo.getReportType() == 5 && one1.getReportType() == 5) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
                    }else{
                    } else {
                        //没有上一层审核通过的数据，则权限给到添加人
                        if(systemUserByPhone.isPresent()){
                        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)){
                            if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }else{
                            if(vo.getReportType() == 5){
                        } else {
                            if (vo.getReportType() == 5) {
                                vo.setListControlsButtonStatus(0);
                            }
                        }
@@ -362,13 +362,13 @@

        //有审核数据，且为审核中
        //审核状态为待审核，需要授权审核按钮
        if(null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()){
        if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()) {
            SystemUser systemUser = systemUserByPhone.get();
            String targetId = "";
            Integer accountLevel = 5;
            //获取当前身份，1=党员，2=管理员
            IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
            if(2 == identityInformation.getIdentity()){
            if (2 == identityInformation.getIdentity()) {
                accountLevel = systemUser.getAccountLevel();
                switch (accountLevel) {
                    case 1:
@@ -397,32 +397,32 @@
                ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                        .eq(ComplaintAuditRecord::getLatestFlag, 1));
                Integer isAdmin = systemUserByPhone.get().getIsAdmin();
                if(one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
                if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin) {
                    vo.setAuditButtonStatus(0);
                }
            }
        }

        

        //状态为已办结，判断评价按钮
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
        if(vo.getStatus() == 3 && 0 == count){
            if(systemUserByPhone.isPresent()){
        if (vo.getStatus() == 3 && 0 == count) {
            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)){
                if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
                    vo.setEvaluateButtonStatus(0);
                }
            }else{
                if(vo.getReportType() == 5){
            } else {
                if (vo.getReportType() == 5) {
                    vo.setEvaluateButtonStatus(0);
                }
            }
        }
    }
    
    


    /**
     * 工单详情
     *
@@ -436,7 +436,7 @@
        Integer accountLevel = 5;
        //获取当前身份，1=党员，2=管理员
        IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
        if (CollectionUtil.isEmpty(identityInformation.getPermissions())){
        if (CollectionUtil.isEmpty(identityInformation.getPermissions())) {
            throw new ServiceException("身份信息异常");
        }
        Integer identity = identityInformation.getIdentity();
@@ -491,11 +491,11 @@
//                detail.setAuditButtonStatus(0);
//            }
//        }
    
    


        buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
        
        


//        //已办结，显示评价按钮
//        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
//        if(detail.getStatus() == 3 && 0 == count){
@@ -596,14 +596,14 @@
                superiorId = Long.parseLong(adminUser.getDistrictsCode());
            } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
                superiorId = 510400L; // 攀枝花市
            } else if(accountLevel == ReportTypeEnum.PARTY.getCode()){
            } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
                superiorId = adminUser.getCommunityId();
            } else {
                // 处理未预期的账号等级
                throw new ServiceException("未知的账号等级");
            }
            //查询社区信息
            switch (accountLevel){
            switch (accountLevel) {
                case 2:
                    BcRegion region = bcRegionService.getDistrictByCode(adminUser.getDistrictsCode().toString());
                    if (Objects.nonNull(region)) {
@@ -622,11 +622,11 @@
                    if (Objects.nonNull(act)) {
                        ComStreet street2 = comStreetService.getById(adminUser.getStreetId().toString());
                        BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
                        departmentName = Objects.nonNull(district) && Objects.nonNull(street2)? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
                        departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
                    }
                    break;
            }
        }else {
        } else {
            throw new ServiceException("未知的账号等级");
        }

@@ -729,7 +729,7 @@
                break;
        }
        complaintAuditRecord.setSuperiorId(superiorId);
        complaintFlowService.createFlow(complaintAuditRecord, 1,loginUserInfoVO.getUserId());
        complaintFlowService.createFlow(complaintAuditRecord, 1, loginUserInfoVO.getUserId());
    }

    @Override
@@ -779,7 +779,7 @@
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
            //创建流程
            complaintFlowService.createFlow(complaintAuditRecord ,0, loginUserInfoVO.getUserId());
            complaintFlowService.createFlow(complaintAuditRecord, 0, loginUserInfoVO.getUserId());
        } else {
            complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
            complaintAuditRecord.setAuditStatus(2);
@@ -795,7 +795,7 @@
        IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
        List<PermissionsVO> permissions = identityInformation.getPermissions();

        if (CollectionUtil.isEmpty(permissions)){
        if (CollectionUtil.isEmpty(permissions)) {
            throw new ServiceException("请先完成认证");
        }

@@ -809,7 +809,7 @@
                throw new ServiceException("延期申请失败，请绑定社区");
            }
            reportType = ReportTypeEnum.COMMUNITY.getCode();
        } else if (identityInformation.getIdentity() == 2 && systemUser!=null){
        } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
            int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
            if (accountLevel == 1) {
                throw new ServiceException("市级账号,无法延期申请！");
@@ -829,7 +829,7 @@
                // 处理未预期的账号等级
                throw new ServiceException("未知的账号等级");
            }
        }else {
        } else {
            throw new ServiceException("无权申请");
        }

@@ -860,11 +860,11 @@
    public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
        IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
        List<PermissionsVO> permissions = identityInformation.getPermissions();
        if (CollectionUtil.isEmpty(permissions)){
        if (CollectionUtil.isEmpty(permissions)) {
            throw new ServiceException("请先完成认证");
        }
        SystemUser systemUser = identityInformation.getSystemUser();
        if (identityInformation.getIdentity() != 2 || systemUser == null){
        if (identityInformation.getIdentity() != 2 || systemUser == null) {
            throw new ServiceException("无权审核");
        }

@@ -877,7 +877,7 @@
            superiorId = Long.parseLong(systemUser.getStreetId());
        } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
            superiorId = Long.parseLong(systemUser.getDistrictsCode());
        }  else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
        } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
            superiorId = 510400L;
        } else {
            // 处理未预期的账号等级
@@ -903,13 +903,13 @@
            Complaint complaint = getById(complaintAuditRecord.getComplaintId());
            complaint.setStatus(1);
            updateById(complaint);
            

            complaintAuditRecord.setAuditStatus(1);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
        }
        //审核不通过
        if(complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)){
        if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)) {
            complaintAuditRecord.setRejectReason(dto.getRejectReason());
            complaintAuditRecord.setAuditStatus(2);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -1037,7 +1037,7 @@
     */
    @Override
    public Page<ComplaintVO> pageList(MgtComplaintQuery query, SystemUserVo loginUserInfo) {
        return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query,loginUserInfo);
        return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
    }

    @Override
@@ -1061,12 +1061,13 @@

    /**
     * 诉求列表导出
     *
     * @param query
     * @param loginUserInfo
     */
    @Override
    public void export(MgtComplaintQuery query, SystemUserVo loginUserInfo) throws IOException {
        List<ComplaintVO> list =  baseMapper.getList(query, loginUserInfo);
        List<ComplaintVO> list = baseMapper.getList(query, loginUserInfo);
        List<ComplaintExcel> complaintExcels = BeanUtil.copyToList(list, ComplaintExcel.class);
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
@@ -1078,15 +1079,15 @@
    }

    @Override
    public void downloadFile(Long id,Integer type) throws IOException {
    public void downloadFile(Long id, Integer type) throws IOException {
        Complaint complaint = baseMapper.getDetailBg(id);
        if (Objects.isNull(complaint)) {
            throw new ServiceException("该诉求不存在");
        }
         //查询社区信息
        //查询社区信息
        Integer reportType = complaint.getReportType();
        String community = "";
        switch (reportType){
        switch (reportType) {
            case 1:
                community = "攀枝花市";
                break;
@@ -1108,7 +1109,7 @@
                if (Objects.nonNull(act)) {
                    ComStreet street2 = comStreetService.getById(complaint.getStreetId().toString());
                    BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
                    community = Objects.nonNull(district) && Objects.nonNull(street2)? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
                    community = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
                }
                break;
            case 5:
@@ -1116,17 +1117,17 @@
                if (Objects.nonNull(act2)) {
                    ComStreet street2 = comStreetService.getById(complaint.getStreetId().toString());
                    BcRegion district = bcRegionService.getDistrictByCode(act2.getAreaCode());
                    community = Objects.nonNull(district) && Objects.nonNull(street2)? district.getRegionName() + "-" + street2.getName() + "-" + act2.getName() : act2.getName();
                    community = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act2.getName() : act2.getName();
                }
                break;
        }

        PartyMember partyMember = null;
        if (Objects.nonNull(complaint.getPartyMemberId())){
             partyMember = partyMemberService.getById(complaint.getPartyMemberId());
        if (Objects.nonNull(complaint.getPartyMemberId())) {
            partyMember = partyMemberService.getById(complaint.getPartyMemberId());
        }
        String fileName = "";
        switch (type){
        switch (type) {
            case 1:
                fileName = "社区问题单";
                break;
@@ -1145,7 +1146,7 @@
        map.put("problemType", complaint.getProblemType());
        map.put("descriptionContent", complaint.getDescriptionContent());
        map.put("reportType", ReportTypeEnum.fromCode(reportType).getDescription());
        map.put("partyOrganization",Objects.nonNull(partyMember)? partyMember.getPartyOrganization() : "");
        map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
        map.put("name", complaint.getName());
        map.put("contactNumber", complaint.getContactNumber());
        map.put("nickname", complaint.getReportUserName());
@@ -1154,7 +1155,7 @@
        StringBuilder sb = new StringBuilder();
        if (CollUtil.isNotEmpty(list)) {
            int rowNum = 1;
            list.forEach(item->{
            list.forEach(item -> {
                sb.append(rowNum).append("、 ");
                sb.append(item.getDescribe()).append("\n");
            });
@@ -1171,8 +1172,8 @@
        }
        response.setContentType("application/octet-stream");
        String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition","attachment;filename=\""+fileNameEncode+".docx"+"\"");
        String fileTemplateName = FileUtil.getPath() + "template/"+fileName+".docx";
        response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
        String fileTemplateName = FileUtil.getPath() + "template/" + fileName + ".docx";
        XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
    }

@@ -1199,16 +1200,17 @@
            e.printStackTrace();
        }
    }
    
    


    /**
     * 获取超时未评价的数据
     *
     * @return
     */
    @Override
    public List<Complaint> getTimeoutAndNotComment() {
        return this.baseMapper.getTimeoutAndNotComment();
    }
    public List<Complaint> getTimeoutAndNotComment() {
        return this.baseMapper.getTimeoutAndNotComment();
    }

}


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

@@ -22,6 +22,7 @@
    private final ISystemUserService systemUserService;
    private final IPartyMemberService partyMemberService;
    private final RedisUtils redisUtils;

    @Override
    public IdentityInformation getIdentityInformation(LoginUserInfoVO loginUserInfo) {
        // 获取党员信息
@@ -40,7 +41,7 @@

        // 获取提示内容是否确认
        Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
        identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
        identityInformationVO.setIsConfirmContent(isConfirm != null && isConfirm == 1);

        if (partyMember != null) {
            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
@@ -52,21 +53,20 @@
        if (identity == null && systemUser != null) {
            identityInformationVO.setIdentity(2);
            redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
        }else if (identity == null && partyMember != null){
        } else if (identity == null && partyMember != null) {
            identityInformationVO.setIdentity(1);
            redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
        }
        else {
        } else {
            identityInformationVO.setIdentity(identity);
        }

        if (identityInformationVO.getIdentity() != null){
            if (identityInformationVO.getIdentity() == 1){
                identityInformationVO.setIsFrozen(partyMember !=null && partyMember.getFreezeStatus() == 1);
            }else if (identityInformationVO.getIdentity() == 2){
                identityInformationVO.setIsFrozen(systemUser != null &&systemUser.getStatus() == 2);
        if (identityInformationVO.getIdentity() != null) {
            if (identityInformationVO.getIdentity() == 1) {
                identityInformationVO.setIsFrozen(partyMember != null && partyMember.getFreezeStatus() == 1);
            } else if (identityInformationVO.getIdentity() == 2) {
                identityInformationVO.setIsFrozen(systemUser != null && systemUser.getStatus() == 2);
            }
        }else {
        } else {
            identityInformationVO.setIsFrozen(false);
        }

@@ -74,13 +74,7 @@
        identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember != null) {
            PermissionsVO partyMemberPermissions = new PermissionsVO();
            partyMemberPermissions.setIdentity(1);
            partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
            partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
            permissions.add(partyMemberPermissions);
        }

        if (systemUser != null) {
            Integer accountLevel = systemUser.getAccountLevel();
            String districts = systemUser.getDistricts();
@@ -91,18 +85,25 @@
            adminPermissions.setIsFrozen(systemUser.getStatus() == 2);
            if (accountLevel == 1) {
                adminPermissions.setName(String.format("%s%s", "攀枝花市", "管理员"));
            }
            if (accountLevel == 2) {
            } else if (accountLevel == 2) {
                adminPermissions.setName(String.format("%s%s", districts, "管理员"));
            } else if (accountLevel == 3) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s", districts, street, "管理员"));
            } else if (accountLevel == 4) {
                adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
                adminPermissions.setIdentity(2);
            } else {
                adminPermissions.setName("未知");
            }
            permissions.add(adminPermissions);
        }

        if (partyMember != null) {
            PermissionsVO partyMemberPermissions = new PermissionsVO();
            partyMemberPermissions.setIdentity(1);
            partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
            partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
            permissions.add(partyMemberPermissions);
        }
        identityInformationVO.setPermissions(permissions);
        return identityInformationVO;
    }