网合平台bug修复及细节补充

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java

@@ -117,6 +117,10 @@ public class Approve extends Model<Approve> {
     @TableField(exist = false)
     private String auditUserId;
 
+    @ApiModelProperty(value = "审批人姓名（表示当前审批节点应该让谁来审批）")
+    @TableField(exist = false)
+    private String auditUserName;
+
     @ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java

@@ -121,6 +121,10 @@ public class Xcrw extends Model<Xcrw> {
     @ApiModelProperty(value = "协查任务反馈状态")
     private String xcrwFkzt;
 
+    @ApiModelProperty(value = "协查任务反馈状态")
+    @TableField(exist = false)
+    private String xcrwFkztStr;
+
     @ApiModelProperty(value = "协查任务审批人警号")
     private String xcrwsprjh;
 
@@ -178,20 +182,27 @@ public class Xcrw extends Model<Xcrw> {
     @ApiModelProperty(value = "协查任务退回状态")
     private String xcrwThzt;
 
+    @ApiModelProperty(value = "协查任务退回状态")
+    private String xcrwThztStr;
+
     @ApiModelProperty(value = "协查任务_退回信息")
     private String xcrwThxx;
 
     /**
-     * 审核进度（表名此审批业务总的审核状态）
+     * 审批进度（表名此审批业务总的审批状态）
      * 1：待审批：表示所有的审批节点还在走流程
      * 2：审批通过：所有审批节点均审批通过
      * 3：驳回：后置审批节点中有驳回的情况,流程终止
      * 4：撤销：审批申请人自己撤销了审批
      */
-    @ApiModelProperty(value = "审核进度")
+    @ApiModelProperty(value = "审批进度")
     @TableField(exist = false)
     private String auditStatus;
 
+    @ApiModelProperty(value = "审批进度")
+    @TableField(exist = false)
+    private String auditStatusStr;
+
     @ApiModelProperty(value = "审批人")
     @TableField(exist = false)
     private String auditUserId;

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxDto.java

@@ -222,6 +222,9 @@ public class ZczxDto extends BaseDto {
     @ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
     private String auditUserId;
 
+    @ApiModelProperty(value = "审批人姓名")
+    private String auditUserName;
+
     /**
      * 审核人类型（表示当前节点审核时审核人的类型）
      * 1：特指某人

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java

 package com.founder.commonutils.model.zczxEntity;
 
-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.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,6 +89,9 @@ public class ZczxRole extends Model<ZczxRole> {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gxsj;
 
+    @ApiModelProperty(value = "信息删除判断标志")
+    private String xxscPdbz;
+
     @ApiModelProperty(value = "审批表主键")
     @TableField(exist = false)
     private String approveId;

common/service_base/src/main/java/com/founder/servicebase/config/EduConfig.java

@@ -3,14 +3,11 @@ package com.founder.servicebase.config;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-/*
-@MapperScan("com.founder.servicebase.mapper")
-*/
+//@MapperScan("com.founder.publicapi.mapper.mysqlMapper")
 public class EduConfig {
 
     /**

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -70,7 +70,10 @@ public class SysUserController extends ApiController {
 
         String username = desEncrypt(user.getUsername(), KEY, IV).trim();
         String password = desEncrypt(user.getPassword(), KEY, IV).trim();
-
+        // 解密失败
+        if ("123456".equals(password) || "123456".equals(password)) {
+            return MapRestResult.build(201, "密码过于简单,请重制!", "密码过于简单,请重制!");
+        }
         // 解密失败
         if ("解密失败".equals(username) || "解密失败".equals(password)) {
             return MapRestResult.build(201, "解密失败", "解密失败");
@@ -88,7 +91,7 @@ public class SysUserController extends ApiController {
         queryWrapper.eq("scbz", 0);
         SysUser one = sysUserService.getOne(queryWrapper);
         if (one == null) {
-            return MapRestResult.build(201, "该用户不存在", null);
+            return MapRestResult.build(201, "用户名或密码错误", null);
         }
 
 //        if (!DigestUtil.encrypt(password).equals(one.getPassword())) {

common/service_base/src/main/resources/bootstrap.properties

@@ -60,6 +60,9 @@ spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.password=XzPwd#11022
 #xml\u0268\uFFFD\uFFFD
 mybatis-plus.mapper-locations=classpath*:com/founder/servicebase/mapper/xml/*.xml
+#mybatis-plus.global-config.db-config.logic-delete-value=1
+#mybatis-plus.global-config.db-config.logic-not-delete-value=0
+
 #es\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0631\uFFFD
 management.health.elasticsearch.enabled=false
 

service/publicapi/src/main/java/com/founder/publicapi/config/MyBatisPlusConfig.java

+//package com.founder.publicapi.config;
+//
+//import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+//import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @author Godffy
+// * @create 2023-07-14 9:59
+// */
+//@Configuration
+//@MapperScan("com.founder.publicapi.mapper.mysqlMapper")
+//public class MyBatisPlusConfig {
+//
+//    /**
+//     * 逻辑删除插件
+//     */
+//    @Bean
+//    public ISqlInjector sqlInjector() {
+//        return new LogicSqlInjector();
+//    }
+//}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java

@@ -11,6 +11,7 @@ import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.zczxEntity.Approve;
 import com.founder.commonutils.model.zczxEntity.ApproveDetail;
 import com.founder.commonutils.model.zczxEntity.ApproveDto;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.publicapi.service.ApproveDetailService;
 import com.founder.publicapi.service.ApproveService;
@@ -110,11 +111,9 @@ public class ApproveController extends ApiController {
     /**
      * 拥有一级审批角色的用户才可以看到该列表及进行操作
      * 前端已限制可视，接口可不判断
-     * <p>
-     * 只能看到发给自己的
-     * <p>
-     * 1、审批列表
-     * 2、待我审批
+     * 1、审批列表（只看我发送的）
+     * 2、待我审批（领导看发送给我的）
+     * 3、我已审批（领导看发送给我的）
      *
      * @param approveDto
      * @return
@@ -180,8 +179,13 @@ public class ApproveController extends ApiController {
         String auditType = approveDto.getAuditType();//审批类型
         String auditStatus = approveDto.getAuditStatus();//审批状态
         if (StringUtils.isNotBlank(auditType) && auditType.equals("9") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
-            String flowNo = approveDto.getFlowNo();//审批编号(连接具体业务表的数据主键)
-            zczxRoleService.removeById(flowNo);
+            UpdateWrapper<ZczxRole> zczxRoleUpdateWrapper = new UpdateWrapper<>();
+            zczxRoleUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
+            ZczxRole zczxRole = new ZczxRole();
+            zczxRole.setXxscPdbz("1");
+            zczxRoleService.update(zczxRole, zczxRoleUpdateWrapper);
+//            String flowNo = approveDto.getFlowNo();//审批编号(连接具体业务表的数据主键)
+//            zczxRoleService.removeById(flowNo);
         }
         return new MapRestResult();
     }

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java

@@ -2,6 +2,7 @@ package com.founder.publicapi.controller.ZczxService;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -189,7 +190,7 @@ public class ZczxController extends ApiController {
         approveDetail.setId(approveDetailNo);//审批明细表主键
         approveDetail.setAuditId(approveNo);//连接审批主表主键
         approveDetail.setAuditUserId(zczxDto.getAuditUserId());//由谁审批
-        approveDetail.setAuditUserName(trueName);//审批人
+        approveDetail.setAuditUserName(zczxDto.getAuditUserName());//审批人
         approveDetail.setLrr(trueName);
         approveDetail.setLrrjh(policemanid);
         approveDetail.setLrrdwdm(unitcode);
@@ -283,12 +284,20 @@ public class ZczxController extends ApiController {
                 (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = requestAttributes.getRequest();
         SysUser user = (SysUser) request.getAttribute("user");
+        String trueName = user.getTrueName();
         String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();
+        String unitname = user.getUnitname();
 
         ZczxRole zczxRole = new ZczxRole();
         zczxRole.setId(KeyUtil.getUUIDKey("ZXR"));
         zczxRole.setZxbh(zxbh);
-        zczxRole.setPolicemanid(policemanid);
+        //基本信息
+        zczxRole.setLrr(trueName);
+        zczxRole.setLrrjh(policemanid);
+        zczxRole.setLrrdwdm(unitcode);
+        zczxRole.setLrrdwmc(unitname);
+        zczxRole.setRksj(new Date());
         zczxRole.setZczxSczt("1");
         this.zczxRoleService.save(zczxRole);
         return new MapRestResult();
@@ -310,16 +319,32 @@ public class ZczxController extends ApiController {
                 (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = requestAttributes.getRequest();
         SysUser user = (SysUser) request.getAttribute("user");
+        String trueName = user.getTrueName();
         String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();
+        String unitname = user.getUnitname();
 
-        QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
-        // 按专项编号查询
-        qw.eq("zxbh", zxbh);
-        // 按警号查询
-        qw.eq("policemanid", policemanid);
-        // 查收藏状态为“1”的数据
-        qw.eq("zczx_sczt", "1");
-        this.zczxRoleService.remove(qw);
+//        QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+//        // 按专项编号查询
+//        qw.eq("zxbh", zxbh);
+//        // 按警号查询
+//        qw.eq("policemanid", policemanid);
+//        // 查收藏状态为“1”的数据
+//        qw.eq("zczx_sczt", "1");
+//        this.zczxRoleService.remove(qw);
+
+        UpdateWrapper<ZczxRole> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("zxbh", zxbh);//专项编号
+        updateWrapper.eq("policemanid", policemanid);//警号
+        updateWrapper.eq("zczx_sczt","1");//收藏状态为"1"的数据
+        ZczxRole zczxRole = new ZczxRole();
+        zczxRole.setGxr(trueName);
+        zczxRole.setGxrjh(policemanid);
+        zczxRole.setGxrdwdm(unitcode);
+        zczxRole.setGxrdwmc(unitname);
+        zczxRole.setGxsj(new Date());
+        zczxRole.setXxscPdbz("1");
+        zczxRoleService.update(zczxRole, updateWrapper);
         return new MapRestResult();
     }
 

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java

@@ -2,6 +2,7 @@ package com.founder.publicapi.controller.ZczxService;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.model.PageSimpleVO;
@@ -23,7 +24,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -136,7 +136,6 @@ public class ZczxRoleController {
 
     /**
      * 1、退出协查任务（参与状态）
-     * 2、取消分享
      *
      * @param zczxRoleDto
      * @return
@@ -146,9 +145,35 @@ public class ZczxRoleController {
     @OperLog(message = "删除侦查专项角色信息", operation = OperationType.ADD)
     @Transactional
     public MapRestResult deleteByIds(@RequestBody ZczxRoleDto zczxRoleDto) {
+        //当前登陆人的信息
+        ServletRequestAttributes requestAttributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        SysUser user = (SysUser) request.getAttribute("user");
+        String trueName = user.getTrueName();
+        String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();
+        String unitname = user.getUnitname();
+
         String[] role_ids = zczxRoleDto.getIds();
-        List<String> ids = Arrays.asList(role_ids);
-        this.zczxRoleService.removeByIds(ids);
+        for (int i = 0; i < role_ids.length; i++) {
+            String id = role_ids[i];
+            UpdateWrapper<ZczxRole> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("id",id);
+            ZczxRole zczxRole = new ZczxRole();
+            //基本信息
+            zczxRole.setGxr(trueName);
+            zczxRole.setGxrjh(policemanid);
+            zczxRole.setGxrdwdm(unitcode);
+            zczxRole.setGxrdwmc(unitname);
+            zczxRole.setGxsj(new Date());
+            //删除判断标志
+            zczxRole.setXxscPdbz("1");
+            zczxRoleService.update(zczxRole, updateWrapper);
+        }
+//        String[] role_ids = zczxRoleDto.getIds();
+//        List<String> ids = Arrays.asList(role_ids);
+//        this.zczxRoleService.removeByIds(ids);
         return new MapRestResult();
     }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml

@@ -38,11 +38,15 @@
             ad.audit_user_id,
             ad.audit_time,
             ad.audit_opinion,
-            ad.audit_remark
+            ad.audit_remark,
+            ad.audit_user_name
         from tb_wh_approve wa
         left join tb_wh_approve_detail ad on wa.id = ad.audit_id
         where
-        ad.audit_user_id = #{approveDto.auditUserId , jdbcType=VARCHAR }
+        1=1
+        <if test="approveDto.auditUserId!= null and approveDto.auditUserId!=''">
+            AND ad.audit_user_id= #{approveDto.auditUserId , jdbcType=VARCHAR }
+        </if>
         <if test="approveDto.flowNo!= null and approveDto.flowNo!=''">
             AND wa.flow_no= #{approveDto.flowNo , jdbcType=VARCHAR }
         </if>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.xml

@@ -45,6 +45,10 @@
         x.jqbh,
         x.yqbh,
         x.xcrw_fkzt,
+        case
+        when x.xcrw_fkzt = '0' then '未反馈'
+        when x.xcrw_fkzt = '1' then '已反馈'
+        end as xcrwFkztStr,
         x.xcrwsprjh,
         x.xcrwsprxm,
         x.xcrwsprdwdm,
@@ -55,8 +59,17 @@
         x.xcrw_xcxq,
         x.xcrw_bz,
         x.xcrw_thzt,
+        case
+        when x.xcrw_thzt = '0' then '未退回'
+        when x.xcrw_thzt = '1' then '已退回'
+        end as xcrwThztStr,
         x.xcrw_thxx,
         a.audit_status,
+        case
+        when a.audit_status = '1' then '待审批'
+        when a.audit_status = '2' then '审批通过'
+        when a.audit_status = '3' then '审批不通过'
+        end as auditStatusStr,
         ad.audit_user_id,
         ad.audit_user_name,
         ad.audit_time,

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml

@@ -45,6 +45,7 @@
         left join tb_st_yq y on z.yqmc = y.title
         where
         z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
+        AND z.xxsc_pdbz ='0'
         <if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
             AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
         </if>
@@ -182,6 +183,8 @@
         where
         1=1
         AND r.zczx_cyzt = '1'
+        AND z.xxsc_pdbz = '0'
+        AND r.xxsc_pdbz = '0'
         <if test="zczxDto.zxdlrjh!=null and zczxDto.zxdlrjh!=''">
             AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
         </if>
@@ -322,6 +325,8 @@
         where
         1=1
         AND r.zczx_sczt = '1'
+        AND z.xxsc_pdbz = '0'
+        AND r.xxsc_pdbz = '0'
         <if test="zczxDto.zxdlrjh!=null and zczxDto.zxdlrjh!=''">
             AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
         </if>
@@ -462,7 +467,8 @@
         left join tb_wh_zczx_role r on z.zxbh = r.zxbh
         left join tb_wh_approve a on r.id = a.flow_no
         where
-        1=1
+        z.xxsc_pdbz = '0'
+        AND r.xxsc_pdbz = '0'
         <if test="zczxDto.cxlx!=null and zczxDto.cxlx=='2'.toString()">
             AND r.unitcode like #{zczxDto.unitcode , jdbcType=VARCHAR } ||'%'
         </if>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxRoleMapper.xml

@@ -30,6 +30,7 @@
         left join tb_wh_approve a on r.id = a.flow_no
         where
         1=1
+        AND r.xxsc_pdbz = '0'
         <if test="zczxRoleDto.zxbh!=null and zczxRoleDto.zxbh!=''">
             AND r.zxbh = #{zczxRoleDto.zxbh , jdbcType=VARCHAR }
         </if>

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ApproveServiceImpl.java

@@ -2,17 +2,12 @@ package com.founder.publicapi.service.serviceimpl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.zczxEntity.Approve;
 import com.founder.commonutils.model.zczxEntity.ApproveDto;
 import com.founder.publicapi.mapper.mysqlMapper.ApproveMapper;
 import com.founder.publicapi.service.ApproveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author Godffy
@@ -51,12 +46,12 @@ public class ApproveServiceImpl extends ServiceImpl<ApproveMapper, Approve> impl
     @Override
     public IPage<Approve> listApproveForPage(IPage page, ApproveDto approveDto) {
         //当前登陆人的信息
-        ServletRequestAttributes requestAttributes =
-                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = requestAttributes.getRequest();
-        SysUser user = (SysUser) request.getAttribute("user");
-        String policemanid = user.getPolicemanid();
-        approveDto.setAuditUserId(policemanid);
+//        ServletRequestAttributes requestAttributes =
+//                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+//        HttpServletRequest request = requestAttributes.getRequest();
+//        SysUser user = (SysUser) request.getAttribute("user");
+//        String policemanid = user.getPolicemanid();
+//        approveDto.setAuditUserId(policemanid);
         IPage<Approve> result = this.approveMapper.listApproveForPage(page,approveDto);
         return result;
     }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java

@@ -71,6 +71,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw.eq("zczx_sczt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole sczt = zczxRoleMapper.selectOne(qw);
                 if (sczt != null) {
                     zczx.setZczxSczt(sczt.getZczxSczt());
@@ -97,6 +98,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 //参与状态
                 qw.eq("zczx_cyzt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole zczxRole = zczxRoleMapper.selectOne(qw);
                 if (zczxRole != null) {
                     zczx.setRoleId(zczxRole.getRoleId());
@@ -121,6 +123,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw.eq("zczx_cyzt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
                 if (cyzt != null) {
                     zczx.setZczxCyzt(cyzt.getZczxCyzt());
@@ -132,6 +135,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw2.eq("zczx_sczt", "1");
+                qw2.eq("xxsc_pdbz", "0");
                 ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
                 if (sczt != null) {
                     zczx.setZczxSczt(sczt.getZczxSczt());
@@ -167,6 +171,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw.eq("zczx_cyzt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
                 if (cyzt != null) {
                     zczx.setRoleNo(cyzt.getId());
@@ -179,6 +184,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw2.eq("zczx_sczt", "1");
+                qw2.eq("xxsc_pdbz", "0");
                 ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
                 if (sczt != null) {
                     zczx.setZczxSczt(sczt.getZczxSczt());
@@ -209,6 +215,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw.eq("zczx_cyzt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
                 if (cyzt != null) {
                     zczx.setRoleNo(cyzt.getId());
@@ -221,6 +228,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw2.eq("zczx_sczt", "1");
+                qw2.eq("xxsc_pdbz", "0");
                 ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
                 if (sczt != null) {
                     zczx.setZczxSczt(sczt.getZczxSczt());
@@ -243,6 +251,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw.eq("zczx_cyzt", "1");
+                qw.eq("xxsc_pdbz", "0");
                 ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
                 if (cyzt != null) {
                     zczx.setRoleNo(cyzt.getId());
@@ -255,6 +264,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
                 qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
                 qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
                 qw2.eq("zczx_sczt", "1");
+                qw2.eq("xxsc_pdbz", "0");
                 ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
                 if (sczt != null) {
                     zczx.setZczxSczt(sczt.getZczxSczt());

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -74,6 +74,9 @@ ResourceManagerDownload = http://47.92.48.137:1009/excel/ResourceManager/
 
 #xml???
 mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
+#mybatis-plus.global-config.db-config.logic-delete-value=1
+#mybatis-plus.global-config.db-config.logic-not-delete-value=0
+
 #es?????????
 management.health.elasticsearch.enabled=false
 #??????\uFFFD\uFFFD

service/publicapi/src/main/resources/bootstrap-prod.properties

@@ -54,6 +54,9 @@ ResourceManagerDownload = http://47.92.48.137:1009/excel/ResourceManager/
 
 #xml???
 mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
+#mybatis-plus.global-config.db-config.logic-delete-value=1
+#mybatis-plus.global-config.db-config.logic-not-delete-value=0
+
 #es?????????
 management.health.elasticsearch.enabled=false
 #??????\uFFFD\uFFFD