2.0优化 和修改bug

liujie

2025-07-11 c3892d8e7378ea9441689ebe7009b3e02160b7a1

2.0优化 和修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java

@@ -105,7 +105,7 @@
        if(query.getCityCode()==null && query.getDistrictCode()==null && query.getStreetId()==null && query.getCommunityId()==null){
            if(systemUser.getSystemRoleId()==1 || systemUser.getSystemRoleId()==2){
                if(systemUser.getSystemRoleId()==1){
                    wrapper.ne(Complaint::getProblemType,"检举");
                    wrapper.ne(Complaint::getProblemType,"纪委").or(w->w.isNull(Complaint::getProblemType));
                }
                if(accountLevel==3){
                    String streetId = systemUser.getStreetId();

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java

@@ -120,14 +120,43 @@
        Set<String> collect1 = new HashSet<>();
        if(collect.size() > 0){
            LambdaQueryWrapper<SystemMenu> queryWrapper = new LambdaQueryWrapper<SystemMenu>().in(SystemMenu::getId, collect);
            if(systemUser.getSystemRoleId()!=1 || systemUser.getAccountLevel()!=2){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                        "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                        "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
                        "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
                        "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                        "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del","/complaint/assign","/complaint/assign/list","/complaint/assign/assign","/complaint/assign/export"));
            if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==2){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
                ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
                ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
            }
            if(systemUser.getSystemRoleId()<3 && systemUser.getAccountLevel()==3){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                ,"/work_order_transaction_management/work_order_item_configuration/save"));
            }
            if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==3){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                        ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
                        ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
                        ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
            }
            if(systemUser.getSystemRoleId()<3 && systemUser.getAccountLevel()==4){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                        ,"/work_order_transaction_management/work_order_item_configuration/save"));
            }
            if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==4){
                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                        ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
                        ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
                        ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
            }


//                queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
//                        "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
//                        "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
//                        "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
//                        "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
//                        "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del","/complaint/assign","/complaint/assign/list","/complaint/assign/assign","/complaint/assign/export"
//                        ,"/statistics","/logManagement","/logManagement/list","/party_member","/party_member/list","/party_member/add","/party_member/edit","/party_member/del","/party_member/detail"
//                ,"/party_member/freeze","/party_member/import","/party_member/export","/work_order_transaction_management/problem_type_management","/work_order_transaction_management/problem_type_management/edit"
//                ,"/work_order_transaction_management/problem_type_management/add","/work_order_transaction_management/problem_type_management/del",""));
            List<SystemMenu> systemMenus = systemMenuService.list(queryWrapper);
            collect1 = systemMenus.stream().map(SystemMenu::getUrl).collect(Collectors.toSet());
        }

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/config/SwaggerConfig.java

@@ -25,7 +25,7 @@
    }

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder().title("西区纪委开发文档").description("。").contact(new Contact("lfl", "", ""))
        return new ApiInfoBuilder().title("西区纪委开发文档").description("。").contact(new Contact("liu", "", ""))
            .version("1.0").build();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java

@@ -30,6 +30,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

import static cn.hutool.core.util.ObjectUtil.isNull;
@@ -64,8 +65,8 @@
    @ApiOperation(value = "录入诉求")
    @DistributedLock(lockName = "complaint_serial_number_lock")
    public R<?> save(@Valid @RequestBody Complaint complaint) {
        String time = complaintService.saveComplaint(complaint, getLoginUserInfo());
        return R.ok(time);
        HashMap<String, String> map = complaintService.saveComplaint(complaint, getLoginUserInfo());
        return R.ok(map);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/StaticsController.java

@@ -133,7 +133,7 @@
        if(query.getCityCode()==null && query.getDistrictCode()==null && query.getStreetId()==null && query.getCommunityId()==null){
            if(systemUser.getSystemRoleId()==1 || systemUser.getSystemRoleId()==2){
                if(systemUser.getSystemRoleId()==1){
                    wrapper.ne(Complaint::getProblemType,"检举");
                    wrapper.ne(Complaint::getProblemType,"纪委").or(w->w.isNull(Complaint::getProblemType));
                }
                if(accountLevel==3){
                    String streetId = systemUser.getStreetId();

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/dao/WestPopUpMapper.java

New file
@@ -0,0 +1,17 @@
package com.panzhihua.westcommittee.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.westcommittee.model.entity.WestPopUp;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author administrator
 * @since 2025-07-09
 */
public interface WestPopUpMapper extends BaseMapper<WestPopUp> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/dto/ComplaintReporAuditDTO.java

@@ -19,4 +19,7 @@

    @ApiModelProperty(value = "通过需要指派单位备注")
    private String remark;

    @ApiModelProperty("问题类型")
    private String problemType;
}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/WestPopUp.java

New file
@@ -0,0 +1,44 @@
package com.panzhihua.westcommittee.model.entity;


import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
 * <p>
 * 
 * </p>
 *
 * @author administrator
 * @since 2025-07-09
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("west_pop_up")
public class WestPopUp extends Model<WestPopUp> {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String name;
    private String phone;
    @TableField("dept_name")
    private String deptName;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java

@@ -127,7 +127,7 @@
            List<String> districtPhoneList1 = districtUserList.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
            collect.forEach(complaintTimeout -> {
                // 发送短信
                if(!districtPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                if(!districtPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                    AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList,complaintTimeout.getSerialNumber());
                }
                if(!districtPhoneList1.isEmpty()){
@@ -151,7 +151,7 @@
                        List<String> districtPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
                        List<String> districtPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
                        // 发送短信
                        if(!districtPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!districtPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList2,complaintTimeout.getSerialNumber());
                        }
                        if(!districtPhoneList3.isEmpty()){
@@ -159,7 +159,7 @@
                        }
                    }else {
                        // 发送短信
                        if(!districtPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!districtPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList,complaintTimeout.getSerialNumber());
                        }
                        if(!districtPhoneList1.isEmpty()){
@@ -186,7 +186,7 @@
               List<String> streetPhoneList = streetUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
               List<String> streetPhoneList1 = streetUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
               // 发送短信
                if(!streetPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                if(!streetPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                    AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList,complaintTimeout.getSerialNumber());
                }
                if(!streetPhoneList1.isEmpty()){
@@ -206,7 +206,7 @@
                        List<String> streetPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
                        List<String> streetPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
                        // 发送短信
                        if(!streetPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!streetPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList2,complaintTimeout.getSerialNumber());
                        }
                        if(!streetPhoneList3.isEmpty()){
@@ -216,7 +216,7 @@
                        List<String> streetPhoneList = streetUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
                        List<String> streetPhoneList1 = streetUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
                        // 发送短信
                        if(!streetPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!streetPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList,complaintTimeout.getSerialNumber());
                        }
                        if(!streetPhoneList1.isEmpty()){
@@ -246,7 +246,7 @@
                List<String> communityPhoneList1 = communityUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());

                // 发送短信
                if(!communityPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                if(!communityPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                    AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList, complaintTimeout.getSerialNumber());
                }
                if(!communityPhoneList1.isEmpty()){
@@ -266,7 +266,7 @@
                        List<String> communityPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
                        List<String> communityPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
                        // 发送短信
                        if(!communityPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!communityPhoneList2.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList2, complaintTimeout.getSerialNumber());
                        }
                        if(!communityPhoneList3.isEmpty()){
@@ -276,7 +276,7 @@
                        List<String> communityPhoneList = communityUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
                        List<String> communityPhoneList1 = communityUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
                        // 发送短信
                        if(!communityPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("检举")){
                        if(!communityPhoneList.isEmpty() && !complaintTimeout.getProblemType().equals("纪委")){
                            AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList, complaintTimeout.getSerialNumber());
                        }
                        if(!communityPhoneList1.isEmpty()){

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/IComplaintService.java

@@ -22,6 +22,7 @@
import javax.validation.Valid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -34,7 +35,7 @@
 * @since 2025-02-22
 */
public interface IComplaintService extends IService<Complaint> {
    String saveComplaint(Complaint complaint,LoginUserInfoVO loginUserInfoVO);
    HashMap<String, String> saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO);

    /**
     * 诉求列表

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/WestPopUpService.java

New file
@@ -0,0 +1,17 @@
package com.panzhihua.westcommittee.service;


import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.westcommittee.model.entity.WestPopUp;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author administrator
 * @since 2025-07-09
 */
public interface WestPopUpService extends IService<WestPopUp> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java

@@ -79,11 +79,13 @@
    private final IPartyMemberService partyMemberService;
    private final IdentityInformationService identityInformationService;
    private final IDepartmentService departmentService;
    private final WestPopUpService westPopUpService;

    private final RedisUtils redisUtils;

    @Override
    public String saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
    public  HashMap<String, String> saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
        HashMap<String, String> map = new HashMap<>();
        String timeStr = null;
        // 获取当前日期（年月日）
        String datePrefix = new SimpleDateFormat("yyyyMMdd").format(new Date());
@@ -190,8 +192,16 @@
                complaint.setReportUserPhone(loginUserInfoVO.getPhone());
                complaint.setSuperiorId(loginUserInfoVO.getCommunityId());

                LocalDate localDate = LocalDate.now().plusDays(workOrderItemConfigService.getById(1).getCommunityHandlingTime());
                timeStr = localDate.toString();

                ComAct byId = comActService.getById(loginUserInfoVO.getCommunityId());
                String name = byId.getName();
                WestPopUp one = westPopUpService.getOne(new LambdaQueryWrapper<WestPopUp>().eq(WestPopUp::getName, name));

                if(one!=null){
                    map.put("name", one.getDeptName());
                    map.put("phone", one.getPhone());
                }


            }

@@ -225,7 +235,11 @@
        complaint.setNowLevelSms(0);
        // 保存诉求记录
        save(complaint);
        return timeStr;




        return map;
    }

    @Override
@@ -769,6 +783,9 @@

        //已办结，显示评价按钮
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
        //查询评价
        ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
        detail.setComplaintComment(comment);
        if (detail.getStatus() == 3 && 0 == count) {
            if (systemUserByPhone.isPresent()) {
                if (accountLevel.compareTo(detail.getNowLevel()) == 0) {
@@ -1232,6 +1249,9 @@
            complaint.setRemark(complaintReporAuditDTO.getRemark());
            complaint.setNowLevelTime(new Date());
            complaint.setNowLevelSms(0);
            if (StringUtils.isEmpty(complaint.getProblemType())) {
                complaint.setProblemType(complaintReporAuditDTO.getProblemType());
            }

            // 分配流转
            ComplaintFlow complaintFlow = new ComplaintFlow();

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/WestPopUpServiceImpl.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.westcommittee.service.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.westcommittee.dao.WestPopUpMapper;
import com.panzhihua.westcommittee.model.entity.WestPopUp;
import com.panzhihua.westcommittee.service.WestPopUpService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author administrator
 * @since 2025-07-09
 */
@Service
public class WestPopUpServiceImpl extends ServiceImpl<WestPopUpMapper, WestPopUp> implements WestPopUpService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/resources/mapper/ComplaintMapper.xml

@@ -390,7 +390,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -519,7 +519,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -1084,7 +1084,7 @@
            and t1.status = #{query.status}
        </if>
        <if test="roleId !=2">
            and t1.problem_type != '检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -1163,7 +1163,7 @@
            and t1.status = #{query.status}
        </if>
        <if test="roleId !=2">
            and t1.problem_type != '检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -1308,7 +1308,7 @@
            and t1.status = #{query.status}
        </if>
        <if test="roleId !=2">
            and t1.problem_type != '检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>


@@ -1470,6 +1470,9 @@
        LEFT JOIN west_department wd ON wd.id = sc.assign_person_id
        WHERE sc.assign_person_id =#{loginUserInfo.oneDepartmentId}
        ) as t1 where 1=1
        <if test="query.status !=null">
            and t1.status = #{query.status}
        </if>
        <if test="query.name != null and query.name!=''">
            and t1.name = #{query.name}
        </if>
@@ -1510,7 +1513,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -1644,7 +1647,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>
        ORDER BY t1.create_time DESC
    </select>
@@ -1775,7 +1778,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>
        ORDER BY t1.create_time DESC
    </select>
@@ -1901,7 +1904,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>

        ORDER BY t1.create_time DESC
@@ -2035,7 +2038,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>
        ORDER BY t1.create_time DESC
    </select>
@@ -2166,7 +2169,7 @@
            and t1.tier =4 and t1.code3=#{query.code}
        </if>
        <if test="loginUserInfo.systemRoleId !=2 ">
            and t1.problem_type !='检举'
            and t1.problem_type != '纪委' or t1.problem_type is null
        </if>
        ORDER BY t1.create_time DESC
    </select>
@@ -2184,7 +2187,7 @@
        FROM west_complaint sc
        LEFT JOIN west_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1
        ) as t1 where t1.status = -1
            and t1.problem_type != '检举'
        and (t1.problem_type != '纪委' or t1.problem_type is null)
                <if test="accountLevel!=2">
                    and t1.superior_id = #{code}
                </if>

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/resources/mapper/ComplaintRejectMapper.xml

@@ -41,7 +41,7 @@
                and t3.audit_time between #{examineStartTime} and #{examineEndTime}
            </if>
            <if test="roleId !=2">
                and t2.problem_type !='检举'
                and t2.problem_type != '纪委' or t2.problem_type is null
            </if>


@@ -59,7 +59,7 @@
        <where>
            t3.audit_status=2
            <if test="roleId !=2">
                and t2.problem_type !='检举'
                and t2.problem_type != '纪委' or t2.problem_type is null
            </if>
            <if test="query.serialNumber != null and query.serialNumber != ''">
                and t2.serial_number = #{query.serialNumber}
@@ -133,7 +133,7 @@
                and t3.audit_time between #{examineStartTime} and #{examineEndTime}
            </if>
            <if test="role !=2">
                and t2.problem_type !='检举'
                and t2.problem_type != '纪委' or t2.problem_type is null
            </if>



 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/resources/mapper/WestPopUpMapper.xml

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.westcommittee.dao.WestPopUpMapper">


</mapper>