代码合并解决冲突

authentication/src/main/resources/mapper/SysSystemMapper.xml

@@ -42,6 +42,6 @@
                business_size,legal_name,create_by,
                create_time,update_by,update_time,
                is_delete
-        from sys_system where is_delete = 0
+        from sys_system
     </sql>
 </mapper>

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/dto/PtlAgreementDispatchAction.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.agreement.dispatch.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -32,4 +34,8 @@ public class PtlAgreementDispatchAction implements Serializable {
     @TableField(exist = false)
     private String actionName;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/dto/PtlAgreementDispatchAfterAction.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.agreement.dispatch.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -34,4 +36,9 @@ public class PtlAgreementDispatchAfterAction implements Serializable {
     @TableField(exist = false)
     private String actionName;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/agreement/po/PtlAgreementUrl.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.agreement.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementUrlVo;
 import com.jzg.commons.util.idgen.IdGenerate;
@@ -40,6 +42,11 @@ public class PtlAgreementUrl {
     @TableField(exist = false)
     private String companyName;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
     public PtlAgreementUrl(PtlAgreementUrlVo ptlAgreementUrlVo) {
         this.id = IdGenerate.nextId();
         this.name = ptlAgreementUrlVo.getName();

commons/src/main/java/com/jzg/commons/entity/dto/AmountAuditEditParam.java

@@ -21,5 +21,5 @@ public class AmountAuditEditParam {
     private String picId;
 
     @Schema(description = "付款账户id")
-    private String accountId;
+    private String cardId;
 }

commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "订单审核表分页查询dto")
 @Data
 public class FeeAuditParam extends PageRequest {
@@ -16,6 +18,9 @@ public class FeeAuditParam extends PageRequest {
     @Schema(description = "车牌号")
     private String licenseNo;
 
+    @Schema(description = "车架号")
+    private String vinNo;
+
     @Schema(description = "业务员类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队 6:个代 7：电销 8 渠道")
     private String attrType;
 

commons/src/main/java/com/jzg/commons/entity/orders/vo/FeeAuditVo.java

@@ -36,6 +36,10 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "车牌号")
     private String licenseNo;
 
+    @ExcelProperty("车架号")
+    @Schema(description = "车架号")
+    private String vinNo;
+
     @ExcelProperty("被保人姓名")
     @Schema(description = "被保人姓名")
     private String insurName;

commons/src/main/java/com/jzg/commons/entity/po/EsmUserReferrer.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -30,6 +32,11 @@ public class EsmUserReferrer {
     @Schema(description = "推荐人机构id")
     private String referrerDeptId;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
     public EsmUserReferrer(SysUserJzgInfo sysUserJzgInfo, SysUserJzgInfo referrer) {
         this.id = sysUserJzgInfo.getId();
         this.referrerId = referrer.getId();

commons/src/main/java/com/jzg/commons/entity/po/PtlNewCarJudgeRules.java

@@ -1,11 +1,10 @@
 package com.jzg.commons.entity.po;
 
 
-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.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.*;
 import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -38,4 +37,9 @@ public class PtlNewCarJudgeRules{
 
     private Date saveDate;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/po/SysActivityAward.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -62,7 +64,10 @@ public class SysActivityAward implements Serializable {
     @TableField(exist = false)
     private String imageUrl;
 
-
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 
     public SysActivityAward(){
         this.id = IdGenerate.nextId();

commons/src/main/java/com/jzg/commons/entity/po/SysActivityRecord.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -64,6 +66,10 @@ public class SysActivityRecord implements Serializable {
     @TableField(exist = false)
     private String deptName;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 
 
     public SysActivityRecord() {

commons/src/main/java/com/jzg/commons/entity/po/SysCommonFunction.java

@@ -1,10 +1,11 @@
 package com.jzg.commons.entity.po;
 
-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.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -38,6 +39,11 @@ public class SysCommonFunction implements Serializable {
     @TableField(value = "menu_id")
     private Long menuId;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

commons/src/main/java/com/jzg/commons/entity/po/SysDistributionAudit.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -51,6 +53,10 @@ public class SysDistributionAudit {
     @Schema(description = "租户id")
     private String systemCode;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 
     public SysDistributionAudit(SysUserJzgInfo sysUserJzgInfo) {
         this.sysUserJzgInfoId = sysUserJzgInfo.getId();

commons/src/main/java/com/jzg/commons/entity/po/SysMenu.java

@@ -1,8 +1,10 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -78,4 +80,9 @@ public class SysMenu {
     @Schema(description = "菜单类型 1 车险 2.控制台")
     private String sysType;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/po/SysMessageUser.java

@@ -2,6 +2,8 @@ package com.jzg.commons.entity.po;
 
 import java.io.Serializable;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -33,4 +35,9 @@ public class SysMessageUser implements Serializable {
     /** 是否已读 0.否 1.是 */
     @Schema(description = "是否已读 0.否 1.是")
     private Integer isRead;
+
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }

commons/src/main/java/com/jzg/commons/entity/po/SysSystemMenu.java

@@ -1,8 +1,10 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -23,4 +25,8 @@ public class SysSystemMenu {
     @Schema(description = "菜单名称")
     private String menuId;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -371,6 +371,7 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
         this.deptId = yqirInfo.getDeptId();
         this.typeAttr = yqirInfo.getTypeAttr();
         this.referrerId = yqirInfo.getId();
+        this.leaderId = yqirInfo.getLeaderId();
     }
 
     public SysUserJzgInfo(SysUser sysUser,SysUserJzgInfo inviterInfo) {

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoFile.java

@@ -1,9 +1,12 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.util.idgen.IdGenerate;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -39,6 +42,11 @@ public class SysUserJzgInfoFile implements Serializable {
     @TableField(value = "file_type")
     private String fileType;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
     public SysUserJzgInfoFile(String fileId, String userId, String fileName) {
         this.id = IdGenerate.nextId();
         this.fileId = fileId;

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoSalesman.java

@@ -1,13 +1,13 @@
 package com.jzg.commons.entity.po;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
 
+import java.io.Serial;
+
 /**
  * @author quchen
  * @date 2025/6/20 10:46
@@ -15,7 +15,10 @@ import lombok.Data;
 
 @Data
 @TableName("sys_user_jzg_info_salesman")
-public class SysUserJzgInfoSalesman {
+public class SysUserJzgInfoSalesman extends BaseModel {
+
+    @Serial
+    private static final long serialVersionUID = 7281876348931805282L;
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
@@ -25,11 +28,6 @@ public class SysUserJzgInfoSalesman {
 
     private int partnerStatus;
 
-    @ExcelIgnore
-    @Schema(description = "是否删除")
-    @TableLogic
-    private Integer isDelete;
-
     public SysUserJzgInfoSalesman(){
 
     }

commons/src/main/java/com/jzg/commons/entity/scheme/po/InsBusinessInsurance.java

@@ -1,5 +1,7 @@
 package com.jzg.commons.entity.scheme.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -26,4 +28,9 @@ public class InsBusinessInsurance {
     @Schema(description = "分组")
     private String grouping;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/scheme/po/InsBusinessInsuranceOption.java

@@ -1,5 +1,7 @@
 package com.jzg.commons.entity.scheme.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -20,4 +22,9 @@ public class InsBusinessInsuranceOption {
     @Schema(description = "排序")
     private String sort;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/scheme/po/PtlSchemeInsurance.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.scheme.po;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -23,7 +25,10 @@ public class PtlSchemeInsurance {
     @Schema(description = "选项")
     private String optionId;
 
-
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 
 }
 

commons/src/main/java/com/jzg/commons/entity/scheme/po/PtlSchemeInsuranceDrivingIntention.java

@@ -1,8 +1,10 @@
 package com.jzg.commons.entity.scheme.po;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -28,6 +30,11 @@ public class PtlSchemeInsuranceDrivingIntention {
     @TableField(exist = false)
     @Schema(description = "驾意险名称")
     private String productName;
+
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }
 
 

partner/src/main/java/com/jzg/controller/DistributionController.java

@@ -23,8 +23,7 @@ public class DistributionController extends BaseController {
             log.info("入参:{}", JSONObject.toJSONString(vo));
             DistributionUtils.newSaveFeeInfo(vo.getInsOrders(), vo.getOrdersCosts(), vo.getLicenseNo());
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("合伙人分销明细数据生成失败：{}", e.getMessage());
+            log.error("合伙人分销明细数据生成失败：{}", e.getMessage(),e);
         }
         return HttpResult.ok();
     }

partner/src/main/java/com/jzg/utils/DistributionUtils.java

@@ -68,6 +68,7 @@ public class DistributionUtils {
         SysUserJzgInfo userInfoById = organizationClient.getPartUserInfoByMobile(insOrders.getRealQuoteUserId());
         if (Objects.isNull(userInfoById)){
             log.info("当前出单员不是合伙人用户：{}",insOrders.getRealQuoteUserId());
+            return;
         }
         String userId = userInfoById.getId();
         String userId3 = CalculateCommissionUtils.querySuperiorAndSubordinate(userId, GRADE_3);

platform/src/main/java/com/jzg/mapper/SysRolePermsMapper.java

@@ -26,5 +26,5 @@ public interface SysRolePermsMapper extends BaseMapper<SysRolePerms> {
      * @author lipf
      * @date 2026/5/11 16:39
      */
-    void deleteByMenuId(String menuId);
+//    void deleteByMenuId(String menuId);
 }

platform/src/main/java/com/jzg/mapper/SysUserRoleMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
 
-    void deleteByUserId(@Param("userId") String userId);
+//    void deleteByUserId(@Param("userId") String userId);
 
     List<SysUserRole> selectByUserIdAndSysCodeOne(@Param("userId") String userId, @Param("systemCode") String systemCode);
 }

platform/src/main/java/com/jzg/service/impl/SysMenuServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.dto.SysCommonFunctionDto;
 import com.jzg.commons.entity.po.SysMenu;
+import com.jzg.commons.entity.po.SysRolePerms;
 import com.jzg.commons.entity.po.SysSystemMenu;
 import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.SystemMenuVo;
@@ -271,7 +272,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
     @Override
     public boolean deleteMenuById(String menuId) {
         log.info("根据序号删除对应的菜单信息：menuId=[{}]", menuId);
-        sysRolePermsMapper.deleteByMenuId(menuId);
+//        sysRolePermsMapper.deleteByMenuId(menuId);
+        // 定义查询条件
+        LambdaQueryWrapper<SysRolePerms> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysRolePerms::getPermsId, menuId);
+        // 执行删除操作，返回受影响的行数
+        sysRolePermsMapper.delete(lambdaQueryWrapper);
         return this.removeById(menuId);
     }
 }

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -198,7 +198,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         this.updateById(user);
 
         // 删除当前用户与角色的关联信息
-        sysUserRoleMapper.deleteByUserId(user.getId());
+//        sysUserRoleMapper.deleteByUserId(user.getId());
+        LambdaQueryWrapper<SysUserRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserRole::getUserId, user.getId());
+        // 执行删除操作，返回受影响的行数
+        sysUserRoleMapper.delete(lambdaQueryWrapper);
 
         // 角色信息关联
         List<String> roleList = param.getRoleIdList();

platform/src/main/resources/mapper/EsmInsCompanyMapper.xml

@@ -32,128 +32,130 @@
     <select id="getByLowerId80" resultType="java.lang.String">
         with recursive temp as (select id
                                 from esm_ins_company
-                                where id = #{companyId}
+                                where id = #{companyId} and is_delete = 0
                                 union all
                                 select t.id
                                 from esm_ins_company t
-                                         inner join temp t2 on t2.id = t.parent_id)
+                                         inner join temp t2 on t2.id = t.parent_id
+                                where t.is_delete = 0)
         select id
         from temp
     </select>
 
     <select id="getByLowerId57" resultType="java.lang.String">
         SELECT id
-        FROM (SELECT * FROM esm_ins_company ORDER BY parent_id, id) products_sorted,
+        FROM (SELECT * FROM esm_ins_company WHERE is_delete = 0 ORDER BY parent_id, id) products_sorted,
              (SELECT @pv := #{companyId}) initialisation
         WHERE find_in_set(parent_id, @pv)
-          AND length(
-                @pv := concat(@pv, ',', id))
+          AND length(@pv := concat(@pv, ',', id))
         UNION
         SELECT id
         FROM esm_ins_company
-        WHERE id = #{companyId}
+        WHERE id = #{companyId} and is_delete = 0
     </select>
 
     <select id="queryListByParentId" resultType="com.jzg.commons.entity.po.EsmInsCompany">
         select
-            a.name as "name",
-            a.id as "id"
-        from
-            esm_ins_company   a
+        a.name as "name",
+        a.id as "id"
+        from esm_ins_company a
         <where>
-            <if test="parentId  !=null  and  parentId  !=''">
-                a.parent_id=#{parentId}
+            a.is_delete = 0
+            <if test="parentId != null and parentId != ''">
+                and a.parent_id = #{parentId}
             </if>
         </where>
-
-
     </select>
+
     <select id="findOrderCompanyList" resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
         SELECT DISTINCT
-            ins.company_id AS id,
-            eic.name_simple AS NAME
-        FROM
-            ins_orders ins
-                LEFT JOIN esm_ins_company eic ON ins.company_id = eic.id
-        WHERE
-            IFNULL( ins.company_id, '' )!= ''
-	        AND IFNULL( eic.id, '' )!= ''
-        GROUP BY
-            ins.company_id
+        ins.company_id AS id,
+        eic.name_simple AS name
+        FROM ins_orders ins
+        LEFT JOIN esm_ins_company eic
+        ON ins.company_id = eic.id AND eic.is_delete = 0
+        <where>
+            ins.is_delete = 0
+            AND ins.company_id IS NOT NULL
+            AND ins.company_id != ''
+            AND eic.id IS NOT NULL
+            AND eic.id != ''
+        </where>
+        GROUP BY ins.company_id
     </select>
 
     <select id="getExternalAgreementCompanyList" resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
         SELECT DISTINCT
-            insurance_company_id AS id,
-            insurance_company AS NAME
-        FROM
-            ptl_agreement
+        pa.company_id AS id,
+        eic.name AS name
+        FROM ptl_agreement pa
+        LEFT JOIN esm_ins_company eic
+        ON pa.company_id = eic.id AND eic.is_delete = 0
         <where>
-            is_external = '1'
+            pa.is_external = '1' and pa.is_delete = 0
             <if test="name != null and name != ''">
-                and insurance_company like  concat('%',#{name},'%')
+                and eic.name like concat('%',#{name},'%')
             </if>
-
         </where>
-        GROUP BY
-            insurance_company_id,
-            insurance_company
+        GROUP BY pa.company_id
     </select>
+
     <select id="liveCompanyList" resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
         SELECT
-            eic.id,
-            eic.name,
-            eic.name_simple,
-            eic.remark
-        FROM
-            ptl_agreement pa
-                LEFT JOIN esm_ins_company eic ON pa.company_id = eic.id
-        where
-            pa.is_external = 0
-        GROUP BY
-            eic.id
+        eic.id,
+        eic.name,
+        eic.name_simple,
+        eic.remark
+        FROM ptl_agreement pa
+        LEFT JOIN esm_ins_company eic
+        ON pa.company_id = eic.id AND eic.is_delete = 0
+        <where>
+            pa.is_delete = 0
+            AND pa.is_external = 0
+            AND eic.id IS NOT NULL
+        </where>
+        GROUP BY eic.id
     </select>
-    <select id="findOrderPartnerCompanyList"
-            resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
+
+    <!-- 该sql不能使用，没有ins_area_company表 -->
+    <select id="findOrderPartnerCompanyList" resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
         SELECT DISTINCT
-            agree.partner_companies_id AS id,
-            company.name_simple AS NAME
-        FROM
-            ins_area_company iac
-                left join
-            ptl_agreement agree on iac.agreement_id= agree.id
-                left join
-            esm_ins_company company on agree.partner_companies_id= company.id
-        WHERE
-            IFNULL( agree.partner_companies_id, '' )!= ''
-        GROUP BY
-            agree.partner_companies_id,
-            company.name_simple
+        agree.partner_companies_id AS id,
+        company.name_simple AS name
+        FROM ins_area_company iac
+        LEFT JOIN ptl_agreement agree
+        ON iac.agreement_id = agree.id and agree.is_delete = 0
+        LEFT JOIN esm_ins_company company
+        ON agree.partner_companies_id = company.id AND company.is_delete = 0
+        <where>
+            iac.is_delete = 0
+            AND agree.partner_companies_id IS NOT NULL
+            AND agree.partner_companies_id != ''
+        </where>
+        GROUP BY agree.partner_companies_id, company.name_simple
     </select>
 
-
     <select id="leftList" resultType="com.jzg.commons.entity.vo.EsmInsCompanyResVo">
         SELECT
-            eic.id,
-            eic.name,
-            eic.name_simple,
-            eic.company_code,
-            eic.remark,
-            eic.parent_id,
-            eic.order_num,
-            eic.cn_name,
-            eic.type,
-            eic.logo
-        FROM
-            esm_ins_company eic
-        WHERE
-            1=1
-        <if test="name != null and name != ''">
-            and eic.name like  concat('%',#{name},'%')
-        </if>
+        eic.id,
+        eic.name,
+        eic.name_simple,
+        eic.company_code,
+        eic.remark,
+        eic.parent_id,
+        eic.order_num,
+        eic.cn_name,
+        eic.type,
+        eic.logo
+        FROM esm_ins_company eic
+        <where>
+            eic.is_delete = 0
+            <if test="name != null and name != ''">
+                and eic.name like concat('%',#{name},'%')
+            </if>
+        </where>
     </select>
 
-
     <resultMap id="EsmInsCompanyVo" type="com.jzg.commons.entity.vo.EsmInsCompanyVo">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="code" column="code" jdbcType="VARCHAR"/>
@@ -181,72 +183,68 @@
 
     <select id="findTree" resultMap="EsmInsCompanyVo">
         SELECT
-            eic.id,
-            eic.code,
-            eic.name,
-            eic.name_simple,
-            eic.remark,
-            eic.company_code,
-            eic.parent_id,
-            eic.order_num,
-            eic.cn_name,
-            eic.type,
-            eic.logo,
-            suf.id logoFileId,
-            suf.file_name,
-            suf.file_type,
-            suf.bucket_name,
-            suf.etag
-        FROM
-            esm_ins_company eic
-        left join sys_upload_files suf on eic.logo = suf.id
-        WHERE
+        eic.id,
+        eic.code,
+        eic.name,
+        eic.name_simple,
+        eic.remark,
+        eic.company_code,
+        eic.parent_id,
+        eic.order_num,
+        eic.cn_name,
+        eic.type,
+        eic.logo,
+        suf.id logoFileId,
+        suf.file_name,
+        suf.file_type,
+        suf.bucket_name,
+        suf.etag
+        FROM esm_ins_company eic
+        LEFT JOIN sys_upload_files suf
+        ON eic.logo = suf.id AND suf.is_delete = 0
+        <where>
             eic.is_delete = 0
-        <if test="name != null and name != ''">
-            and eic.name like  concat('%',#{name},'%')
-        </if>
-        <if test="type != null and type != ''">
-            and eic.type = #{type}
-        </if>
+            <if test="name != null and name != ''">
+                and eic.name like concat('%',#{name},'%')
+            </if>
+            <if test="type != null and type != ''">
+                and eic.type = #{type}
+            </if>
+        </where>
     </select>
 
     <select id="getParentIds" resultType="String">
         WITH RECURSIVE t AS (
-            SELECT id
-            FROM esm_ins_company
-            WHERE id in
-        <foreach collection="companyIds"
-                 item="id"
-                 open="("
-                 close=")"
-                 separator=",">
+        SELECT id
+        FROM esm_ins_company
+        WHERE id in
+        <foreach collection="companyIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-            UNION ALL
-
-            SELECT c.id
-            FROM esm_ins_company c
-                     JOIN t ON c.parent_id = t.id
+        AND is_delete = 0
+        UNION ALL
+        SELECT c.id
+        FROM esm_ins_company c
+        JOIN t ON c.parent_id = t.id
+        WHERE c.is_delete = 0
         )
-        SELECT *
-        FROM t;
+        SELECT id FROM t;
     </select>
 
     <select id="getTopCompanyId" resultType="String">
         WITH RECURSIVE t AS (
             SELECT id, parent_id
             FROM esm_ins_company
-            WHERE id = ${companyId}
-
+            WHERE id = #{companyId} AND is_delete = 0
             UNION ALL
             SELECT c.id, c.parent_id
             FROM esm_ins_company c
                      INNER JOIN t pt ON c.id = pt.parent_id
+            WHERE c.is_delete = 0
         )
         SELECT id
         FROM t
         where parent_id = 0;
     </select>
 
-
-</mapper>
+</mapper>

platform/src/main/resources/mapper/InsCompanyClauseMapper.xml

@@ -6,30 +6,32 @@
 
     <select id="getClausePage" resultType="com.jzg.commons.entity.vo.InsCompanyClauseVo">
         SELECT
-            eic.name_simple AS company_name,
-            eic.company_code AS company_code,
-            icc.*
+        eic.name_simple AS company_name,
+        eic.company_code AS company_code,
+        icc.*
         FROM
-            ins_company_clause icc
-            INNER JOIN esm_ins_company eic ON eic.id = icc.company_id
-        where
-            1=1
-          AND icc.is_delete = 0
-        <if test="param.companyId != null and param.companyId != ''">
-            AND company_id = #{param.companyId}
-        </if>
-        <if test="param.riskCode != null and param.riskCode != ''">
-            AND risk_code = #{param.riskCode}
-        </if>
-        <if test="param.clauseCode != null and param.clauseCode != ''">
-            AND clause_code LIKE CONCAT('%', #{param.clauseCode}, '%')
-        </if>
-        <if test="param.clauseName != null and param.clauseName != ''">
-            AND clause_name LIKE CONCAT('%', #{param.clauseName}, '%')
-        </if>
-        <if test="param.clauseContent != null and param.clauseContent != ''">
-            AND clause_content LIKE CONCAT('%', #{param.clauseContent}, '%')
-        </if>
+        ins_company_clause icc
+        INNER JOIN esm_ins_company eic
+        ON eic.id = icc.company_id
+        AND eic.is_delete = 0
+        <where>
+            AND icc.is_delete = 0
+            <if test="param.companyId != null and param.companyId != ''">
+                AND company_id = #{param.companyId}
+            </if>
+            <if test="param.riskCode != null and param.riskCode != ''">
+                AND risk_code = #{param.riskCode}
+            </if>
+            <if test="param.clauseCode != null and param.clauseCode != ''">
+                AND clause_code LIKE CONCAT('%', #{param.clauseCode}, '%')
+            </if>
+            <if test="param.clauseName != null and param.clauseName != ''">
+                AND clause_name LIKE CONCAT('%', #{param.clauseName}, '%')
+            </if>
+            <if test="param.clauseContent != null and param.clauseContent != ''">
+                AND clause_content LIKE CONCAT('%', #{param.clauseContent}, '%')
+            </if>
+        </where>
         order by icc.create_time desc
     </select>
 
@@ -40,37 +42,42 @@
         icc.*
         FROM
         ins_company_clause icc
-        INNER JOIN esm_ins_company eic ON eic.id = icc.company_id
-        where
-        1=1
-        AND icc.is_delete = 0
-        <if test="param.companyId != null and param.companyId != ''">
-            AND company_id = #{param.companyId}
-        </if>
-        <if test="param.riskCode != null and param.riskCode != ''">
-            AND risk_code = #{param.riskCode}
-        </if>
-        <if test="param.clauseCode != null and param.clauseCode != ''">
-            AND clause_code LIKE CONCAT('%', #{param.clauseCode}, '%')
-        </if>
-        <if test="param.clauseName != null and param.clauseName != ''">
-            AND clause_name LIKE CONCAT('%', #{param.clauseName}, '%')
-        </if>
-        <if test="param.clauseContent != null and param.clauseContent != ''">
-            AND clause_content LIKE CONCAT('%', #{param.clauseContent}, '%')
-        </if>
+        INNER JOIN esm_ins_company eic
+        ON eic.id = icc.company_id
+        AND eic.is_delete = 0
+        <where>
+            AND icc.is_delete = 0
+            <if test="param.companyId != null and param.companyId != ''">
+                AND company_id = #{param.companyId}
+            </if>
+            <if test="param.riskCode != null and param.riskCode != ''">
+                AND risk_code = #{param.riskCode}
+            </if>
+            <if test="param.clauseCode != null and param.clauseCode != ''">
+                AND clause_code LIKE CONCAT('%', #{param.clauseCode}, '%')
+            </if>
+            <if test="param.clauseName != null and param.clauseName != ''">
+                AND clause_name LIKE CONCAT('%', #{param.clauseName}, '%')
+            </if>
+            <if test="param.clauseContent != null and param.clauseContent != ''">
+                AND clause_content LIKE CONCAT('%', #{param.clauseContent}, '%')
+            </if>
+        </where>
     </select>
 
     <select id="getClause" resultType="com.jzg.commons.entity.vo.InsCompanyClauseVo">
         SELECT
-            eic.name_simple AS company_name,
-            eic.company_code AS company_code,
-            icc.*
+        eic.name_simple AS company_name,
+        eic.company_code AS company_code,
+        icc.*
         FROM
-            ins_company_clause icc
-            INNER JOIN esm_ins_company eic ON eic.id = icc.company_id
-        where
-            1=1
-          AND icc.id = #{id}
+        ins_company_clause icc
+        INNER JOIN esm_ins_company eic
+        ON eic.id = icc.company_id
+        AND eic.is_delete = 0
+        <where>
+            AND icc.is_delete = 0
+            AND icc.id = #{id}
+        </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/JyxConfigMapper.xml

@@ -28,30 +28,30 @@
             <result column="blame_jyx_config_id" property="jyxConfigId"/>
         </collection>
         <collection property="settingList" ofType="com.jzg.commons.entity.po.jyxSetting">
-                <id column="setting_id" property="id"/>
-                <result column="seats" property="seats"/>
-                <result column="setting_coverage" property="coverage"/>
-                <result column="setting_premium" property="premium"/>
-                <result column="setting_system_code" property="systemCode"/>
-                <result column="setting_jyx_config_id" property="jyxConfigId"/>
+            <id column="setting_id" property="id"/>
+            <result column="seats" property="seats"/>
+            <result column="setting_coverage" property="coverage"/>
+            <result column="setting_premium" property="premium"/>
+            <result column="setting_system_code" property="systemCode"/>
+            <result column="setting_jyx_config_id" property="jyxConfigId"/>
         </collection>
     </resultMap>
 
 
     <sql id="params">
-       jc.`id`, jc.`product_type`,jc.`parent_id`, jc.`product_name`,jc.`alias`,jc.`company`, jc.`product_code`,jc.`connection_method`,jc.`premium_setting`, jc.`coverage` as jsCoverage, jc.`premium` as jsPremium, jc.`system_code`, jc.`is_delete` as isDelete
+        jc.`id`, jc.`product_type`,jc.`parent_id`, jc.`product_name`,jc.`alias`,jc.`company`, jc.`product_code`,jc.`connection_method`,jc.`premium_setting`, jc.`coverage` as jsCoverage, jc.`premium` as jsPremium, jc.`system_code`, jc.`is_delete` as isDelete
     </sql>
 
     <select id="jyxList" resultMap="jyxConfigVo">
         select
         <include refid="params"/> ,
-            jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
-            js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
-            from jyx_config jc
-            left join jyx_blame jb on jc.id = jb.jyx_config_id
-            left join jyx_setting js on jc.id = js.jyx_config_id
+        jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
+        js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
+        from jyx_config jc
+        left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
+        left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0
         <where>
-                jc.is_delete = 0
+            jc.is_delete = 0
             <if test="params != null and params != ''">
                 and (jc.product_name like concat('%',#{params},'%') or jc.alias like concat('%',#{params},'%'))
             </if>
@@ -78,9 +78,10 @@
         jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
         js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
         from jyx_config jc
-        left join jyx_blame jb on jc.id = jb.jyx_config_id
-        left join jyx_setting js on jc.id = js.jyx_config_id
+        left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
+        left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0
         <where>
+            jc.is_delete = 0
             <if test="ids != null and ids != ''">
                 and jc.id in
                 <foreach collection="ids" item="id" open="(" separator="," close=")">
@@ -99,9 +100,10 @@
         jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
         js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
         from jyx_config jc
-        left join jyx_blame jb on jc.id = jb.jyx_config_id
-        left join jyx_setting js on jc.id = js.jyx_config_id
+        left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
+        left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0
         <where>
+            jc.is_delete = 0
             <if test="ids != null and ids != ''">
                 and jc.id in
                 <foreach collection="ids" item="id" open="(" separator="," close=")">
@@ -120,8 +122,8 @@
         jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
         js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
         from jyx_config jc
-        left join jyx_blame jb on jc.id = jb.jyx_config_id
-        left join jyx_setting js on jc.id = js.jyx_config_id
+        left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
+        left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0
         <where>
             jc.is_delete = 0 and jc.parent_id = 0
             <if test="company != null and company != ''">

platform/src/main/resources/mapper/PtlAgreementAttributionMapper.xml

@@ -28,29 +28,29 @@
         sd.name as deptName
         from
         ptl_agreement_attribution paa
-        left join ptl_agreement_url pau on paa.login_url = pau.id
-        left join sys_dept sd on paa.user_dept = sd.id
-        left join esm_ins_company eic on paa.ins_company_id = eic.id
-        where
-        1=1
-        and paa.is_delete = '0'
-        <if test="ptlAgreementAttributionQueryVo.username != null and ptlAgreementAttributionQueryVo.username != ''">
-            and (paa.username like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
-            or paa.user_abbr like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
-            or eic.name_simple like concat('%',#{ptlAgreementAttributionQueryVo.username},'%'))
-        </if>
-        <if test="ptlAgreementAttributionQueryVo.quoteStatus != null and ptlAgreementAttributionQueryVo.quoteStatus != ''">
-            and paa.quote_status = #{ptlAgreementAttributionQueryVo.quoteStatus}
-        </if>
-        <if test="ptlAgreementAttributionQueryVo.insCompanyId != null and ptlAgreementAttributionQueryVo.insCompanyId != ''">
-            and paa.ins_company_id = #{ptlAgreementAttributionQueryVo.insCompanyId}
-        </if>
-        <if test="ptlAgreementAttributionQueryVo.useStatus != null and ptlAgreementAttributionQueryVo.useStatus != ''">
-            and paa.use_status = #{ptlAgreementAttributionQueryVo.useStatus}
-        </if>
-        <if test="ptlAgreementAttributionQueryVo.userDept != null and ptlAgreementAttributionQueryVo.userDept != ''">
-            and paa.user_dept = #{ptlAgreementAttributionQueryVo.userDept}
-        </if>
+        left join ptl_agreement_url pau on paa.login_url = pau.id and pau.is_delete = '0'
+        left join sys_dept sd on paa.user_dept = sd.id and sd.is_delete = '0'
+        left join esm_ins_company eic on paa.ins_company_id = eic.id and eic.is_delete = '0'
+        <where>
+            and paa.is_delete = '0'
+            <if test="ptlAgreementAttributionQueryVo.username != null and ptlAgreementAttributionQueryVo.username != ''">
+                and (paa.username like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
+                or paa.user_abbr like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
+                or eic.name_simple like concat('%',#{ptlAgreementAttributionQueryVo.username},'%'))
+            </if>
+            <if test="ptlAgreementAttributionQueryVo.quoteStatus != null and ptlAgreementAttributionQueryVo.quoteStatus != ''">
+                and paa.quote_status = #{ptlAgreementAttributionQueryVo.quoteStatus}
+            </if>
+            <if test="ptlAgreementAttributionQueryVo.insCompanyId != null and ptlAgreementAttributionQueryVo.insCompanyId != ''">
+                and paa.ins_company_id = #{ptlAgreementAttributionQueryVo.insCompanyId}
+            </if>
+            <if test="ptlAgreementAttributionQueryVo.useStatus != null and ptlAgreementAttributionQueryVo.useStatus != ''">
+                and paa.use_status = #{ptlAgreementAttributionQueryVo.useStatus}
+            </if>
+            <if test="ptlAgreementAttributionQueryVo.userDept != null and ptlAgreementAttributionQueryVo.userDept != ''">
+                and paa.user_dept = #{ptlAgreementAttributionQueryVo.userDept}
+            </if>
+        </where>
         order by paa.create_time desc
     </select>
 
@@ -62,14 +62,14 @@
         eic.company_code as companyCode
         from
         ptl_agreement_attribution paa
-        left join ptl_agreement_url pau on paa.login_url = pau.id
-        left join sys_dept sd on paa.user_dept = sd.id
-        left join esm_ins_company eic on paa.ins_company_id = eic.id
-        where
-        1=1
-        and paa.is_delete = '0'
-        <if test="id != null and id != ''">
-            and paa.id = #{id}
-        </if>
+        left join ptl_agreement_url pau on paa.login_url = pau.id and pau.is_delete = '0'
+        left join sys_dept sd on paa.user_dept = sd.id and sd.is_delete = '0'
+        left join esm_ins_company eic on paa.ins_company_id = eic.id and eic.is_delete = '0'
+        <where>
+            and paa.is_delete = '0'
+            <if test="id != null and id != ''">
+                and paa.id = #{id}
+            </if>
+        </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/PtlAgreementMapper.xml

@@ -10,18 +10,20 @@
         <foreach collection="companyIds" item="cid" open="(" separator="," close=")">
             #{cid}
         </foreach>
-
+        AND is_delete = 0
         UNION ALL
-
         SELECT c.id
         FROM esm_ins_company c
         JOIN company_tree ct ON c.parent_id = ct.id
+        WHERE c.is_delete = 0
         )
         SELECT pa.*
         FROM ptl_agreement_dept pad
-        JOIN ptl_agreement pa ON pad.agreement_id = pa.id
+        JOIN ptl_agreement pa ON pad.agreement_id = pa.id AND pa.is_delete = 0
         JOIN company_tree ct ON pa.company_id = ct.id
-        WHERE pa.is_delete = 0
-        AND pad.dept_id = #{deptId}
+        <where>
+            AND pad.is_delete = 0
+            AND pad.dept_id = #{deptId}
+        </where>
     </select>
 </mapper>

platform/src/main/resources/mapper/PtlAgreementUrlMapper.xml

@@ -11,14 +11,15 @@
         eic.name as companyName
         from
         ptl_agreement_url pau
-        left join esm_ins_company eic on pau.company_id = eic.id
-        where
-        1=1
-        <if test="ptlAgreementUrlVo.companyId != null and ptlAgreementUrlVo.companyId != ''">
-            and pau.company_id = #{ptlAgreementUrlVo.companyId}
-        </if>
-        <if test="ptlAgreementUrlVo.name != null and ptlAgreementUrlVo.name != ''">
-            and pau.name like concat('%',#{ptlAgreementUrlVo.name},'%')
-        </if>
+        left join esm_ins_company eic on pau.company_id = eic.id and eic.is_delete = 0
+        <where>
+            pau.is_delete = 0
+            <if test="ptlAgreementUrlVo.companyId != null and ptlAgreementUrlVo.companyId != ''">
+                and pau.company_id = #{ptlAgreementUrlVo.companyId}
+            </if>
+            <if test="ptlAgreementUrlVo.name != null and ptlAgreementUrlVo.name != ''">
+                and pau.name like concat('%',#{ptlAgreementUrlVo.name},'%')
+            </if>
+        </where>
     </select>
 </mapper>

platform/src/main/resources/mapper/SysMenuMapper.xml

@@ -4,23 +4,29 @@
     <select id="getSystemMenus" resultType="com.jzg.commons.entity.po.SysMenu">
         SELECT sm.*
         FROM sys_system_menu ssm
-                 LEFT JOIN sys_menu sm ON ssm.menu_id = sm.id
-        WHERE ssm.system_code = #{systemCode}
+        LEFT JOIN sys_menu sm ON ssm.menu_id = sm.id AND sm.is_delete = 0
+        <where>
+            ssm.is_delete = 0
+            AND ssm.system_code = #{systemCode}
+        </where>
     </select>
 
     <select id="getSystemMenusRecursion" resultType="com.jzg.commons.entity.po.SysMenu">
         WITH RECURSIVE company_tree AS (SELECT sm.*
                                         FROM sys_system_menu ssm
-                                                 LEFT JOIN sys_menu sm ON ssm.menu_id = sm.id
+                                                 LEFT JOIN sys_menu sm ON ssm.menu_id = sm.id AND sm.is_delete = 0
                                         WHERE ssm.system_code = #{systemCode}
+                                          AND ssm.is_delete = 0
 
                                         UNION ALL
 
                                         SELECT sm.*
                                         FROM sys_menu sm
-                                                 INNER JOIN company_tree mt ON sm.parent_id = mt.id)
+                                                 INNER JOIN company_tree mt ON sm.parent_id = mt.id
+                                        WHERE sm.is_delete = 0)
         SELECT *
         FROM company_tree
+        WHERE is_delete = 0
         ORDER BY parent_id, id;
 
     </select>
@@ -28,24 +34,32 @@
     <select id="getMenuByRoleId" resultType="com.jzg.commons.entity.po.SysMenu">
         SELECT sm.*
         FROM sys_role_perms srp
-        LEFT JOIN sys_menu sm ON srp.perms_id = sm.id
-        WHERE srp.role_id IN
-        <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
-            #{roleId}
-        </foreach>
+        LEFT JOIN sys_menu sm ON srp.perms_id = sm.id AND sm.is_delete = 0
+        <where>
+            srp.is_delete = 0
+            <if test="roleIds != null and roleIds.size > 0">
+                AND srp.role_id IN
+                <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
+                    #{roleId}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="getCommonFunction" resultType="com.jzg.commons.entity.dto.SysCommonFunctionDto">
         select scf.id, scf.title, sm.name, scf.ican
         from sys_common_function scf
-                 left join sys_menu sm on scf.menu_id = sm.id
-        where sm.id in (select srp.perms_id
-                        from sys_role_perms srp
-                                 left join sys_user_role sur on sur.role_id = srp.role_id
-                                 left join sys_user_jzg_info suji on suji.user_id = sur.user_id
-                        where suji.user_id = #{userId}
-                          and suji.system_code = #{systemCode})
+        left join sys_menu sm on scf.menu_id = sm.id AND sm.is_delete = 0
+        <where>
+            scf.is_delete = 0
+            AND sm.id in (select srp.perms_id
+            from sys_role_perms srp
+            left join sys_user_role sur on sur.role_id = srp.role_id AND sur.is_delete = 0
+            left join sys_user_jzg_info suji on suji.user_id = sur.user_id AND suji.is_delete = 0
+            where suji.user_id = #{userId}
+            and suji.system_code = #{systemCode}
+            and srp.is_delete = 0)
+        </where>
     </select>
 
-
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -21,18 +21,21 @@
 
     <select id="getAllRoleMenu" resultMap="RoleMenuMap">
         SELECT
-            ss.id,
-            ss.sys_code as systemCode,
-            ss.sys_name as systemName,
-            sr.id as roleId,
-            sr.name as roleName,
-            sr.remark,
-            srp.perms_id as permsId,
-            srp.perms
+        ss.id,
+        ss.sys_code as systemCode,
+        ss.sys_name as systemName,
+        sr.id as roleId,
+        sr.name as roleName,
+        sr.remark,
+        srp.perms_id as permsId,
+        srp.perms
         FROM
-            sys_system ss
-                LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code
-                LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id
+        sys_system ss
+        LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code AND sr.is_delete = 0
+        LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id AND srp.is_delete = 0
+        <where>
+            ss.is_delete = 0
+        </where>
     </select>
 
     <select id="queryByUserIds" resultType="com.jzg.commons.entity.po.SysUserRole">
@@ -40,8 +43,9 @@
         sur.role_id, sur.user_id,sr.name
         FROM
         sys_user_role sur
-        LEFT JOIN sys_role sr ON sur.role_id = sr.id
+        LEFT JOIN sys_role sr ON sur.role_id = sr.id AND sr.is_delete = 0
         <where>
+            sur.is_delete = 0
             <if test="idList != null and idList.size()" >
                 AND sur.user_id in
                 <foreach collection="idList" item="item" open="(" separator="," close=")">
@@ -50,4 +54,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysRolePermsMapper.xml

@@ -3,31 +3,34 @@
 <mapper namespace="com.jzg.mapper.SysRolePermsMapper">
 
     <!--根据菜单序号删除菜单和角色的对应关系 2026年5月11日16:41:08 lipf -->
-    <delete id="deleteByMenuId">
+   <!-- <delete id="deleteByMenuId">
         delete  from sys_role_perms srp where srp.perms_id = #{menuId}
-    </delete>
+    </delete>-->
 
     <select id="getByRoleId" resultType="com.jzg.commons.entity.po.SysRolePerms">
         select id, role_id as roleId, perms_id as permsId, perms
         from sys_role_perms
         <where>
+            is_delete = 0
             <if test="id != null and id != ''">
-                role_id = #{id}
+                AND role_id = #{id}
             </if>
         </where>
     </select>
 
     <select id="getByRoleIdNew" resultType="com.jzg.commons.entity.po.SysRolePerms">
         SELECT
-            srp.id AS role_id,
-            sm.id AS perms_id,
-            sm.perms,
-            sm.type,
-            srp.half_checked
+        srp.id AS role_id,
+        sm.id AS perms_id,
+        sm.perms,
+        sm.type,
+        srp.half_checked
         FROM
-            sys_menu sm
-                LEFT JOIN sys_role_perms srp ON srp.perms_id = sm.id
-        WHERE
-            role_id = #{roleId}
+        sys_menu sm
+        LEFT JOIN sys_role_perms srp ON srp.perms_id = sm.id AND srp.is_delete = 0
+        <where>
+            sm.is_delete = 0
+            AND srp.role_id = #{roleId}
+        </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysSystemMapper.xml

@@ -47,6 +47,7 @@
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.SysSystemVo">
         <include refid="selectSystemVo"/>
         <where>
+            is_delete = 0
             <if test="sysSystemVo.provinceId != null and sysSystemVo.provinceId != ''">
                 and province_id = #{sysSystemVo.provinceId}
             </if>
@@ -72,6 +73,7 @@
     <select id="queryList" resultType="com.jzg.commons.entity.vo.SysSystemVo">
         <include refid="selectSystemVo"/>
         <where>
+            is_delete = 0
             <if test="sysSystemVo.searchValue != null and sysSystemVo.searchValue != ''">
                 AND (
                 sys_name LIKE concat('%', #{sysSystemVo.searchValue}, '%')
@@ -85,34 +87,34 @@
 
     <select id="getCompanyList" resultType="com.jzg.commons.entity.po.EsmInsCompany">
         SELECT
-            eic.id,
-            eic.code,
-            eic.company_code,
-            eic.name,
-            eic.parent_id,
-            eic.name_simple,
-            eic.remark,
-            eic.order_num,
-            eic.cn_name,
-            eic.type,
-            count(psi.id) as count,
-            suf.file_name as logo
+        eic.id,
+        eic.code,
+        eic.company_code,
+        eic.name,
+        eic.parent_id,
+        eic.name_simple,
+        eic.remark,
+        eic.order_num,
+        eic.cn_name,
+        eic.type,
+        count(psi.id) as count,
+        suf.file_name as logo
         FROM
-            esm_ins_company eic
-                left join sys_upload_files suf on eic.logo = suf.id
-                left join ptl_scheme ps on eic.id = ps.company_id
-                left join ptl_scheme_info psi on ps.id = psi.scheme_id
-        WHERE
+        esm_ins_company eic
+        left join sys_upload_files suf on eic.logo = suf.id and suf.is_delete = 0
+        left join ptl_scheme ps on eic.id = ps.company_id and ps.is_delete = 0
+        left join ptl_scheme_info psi on ps.id = psi.scheme_id and psi.is_delete = 0
+        <where>
             eic.parent_id = 0
-          AND
-            eic.is_delete = 0
-        <if test="companyIds != null and companyIds.size() > 0">
-            and eic.id in
-            <foreach collection="companyIds" item="item" index="index" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+            AND eic.is_delete = 0
+            <if test="companyIds != null and companyIds.size() > 0">
+                and eic.id in
+                <foreach collection="companyIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         group by eic.id
         order by count desc
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -5,54 +5,54 @@
 <mapper namespace="com.jzg.mapper.SysUserJzgInfoMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysUserJzgInfo">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
-            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
-            <result property="status" column="status" jdbcType="TINYINT"/>
-            <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
-            <result property="openId" column="open_id" jdbcType="VARCHAR"/>
-            <result property="alipay" column="alipay" jdbcType="VARCHAR"/>
-            <result property="approvalOpinion" column="approval_opinion" jdbcType="VARCHAR"/>
-            <result property="identity" column="identity" jdbcType="VARCHAR"/>
-            <result property="identityTimeStart" column="identity_time_start" jdbcType="VARCHAR"/>
-            <result property="identityTimeEnd" column="identity_time_end" jdbcType="VARCHAR"/>
-            <result property="logoutTime" column="logout_time" jdbcType="DATE"/>
-            <result property="headSculpture" column="head_sculpture" jdbcType="VARCHAR"/>
-            <result property="factorVerify" column="factor_verify" jdbcType="TINYINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="address" column="address" jdbcType="VARCHAR"/>
-            <result property="nations" column="nations" jdbcType="VARCHAR"/>
-            <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
-            <result property="bankCardId" column="bank_card_id" jdbcType="VARCHAR"/>
-            <result property="koseki" column="koseki" jdbcType="VARCHAR"/>
-            <result property="birthday" column="birthday" jdbcType="DATE"/>
-            <result property="maritalStatus" column="marital_status" jdbcType="VARCHAR"/>
-            <result property="politicsStatus" column="politics_status" jdbcType="VARCHAR"/>
-            <result property="health" column="health" jdbcType="VARCHAR"/>
-            <result property="postalCode" column="postal_code" jdbcType="VARCHAR"/>
-            <result property="bloodType" column="blood_type" jdbcType="VARCHAR"/>
-            <result property="education" column="education" jdbcType="VARCHAR"/>
-            <result property="school" column="school" jdbcType="VARCHAR"/>
-            <result property="graduationTime" column="graduation_time" jdbcType="DATE"/>
-            <result property="isComputer" column="is_computer" jdbcType="TINYINT"/>
-            <result property="formerEmployer" column="former_employer" jdbcType="VARCHAR"/>
-            <result property="entryTime" column="entry_time" jdbcType="DATE"/>
-            <result property="agentQualificationCode" column="agent_qualification_code" jdbcType="VARCHAR"/>
-            <result property="emergencyContactTel" column="emergency_contact_tel" jdbcType="VARCHAR"/>
-            <result property="emergencyContactName" column="emergency_contact_name" jdbcType="VARCHAR"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="email" column="email" jdbcType="VARCHAR"/>
-            <result property="sex" column="sex" jdbcType="VARCHAR"/>
-            <result property="speciality" column="speciality" jdbcType="VARCHAR"/>
-            <result property="salary" column="salary" jdbcType="DECIMAL"/>
-            <result property="salaryLevel" column="salary_level" jdbcType="VARCHAR"/>
-            <result property="liveAddress" column="live_address" jdbcType="VARCHAR"/>
-            <result property="province" column="province" jdbcType="VARCHAR"/>
-            <result property="city" column="city" jdbcType="VARCHAR"/>
-            <result property="district" column="district" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="TINYINT"/>
+        <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
+        <result property="openId" column="open_id" jdbcType="VARCHAR"/>
+        <result property="alipay" column="alipay" jdbcType="VARCHAR"/>
+        <result property="approvalOpinion" column="approval_opinion" jdbcType="VARCHAR"/>
+        <result property="identity" column="identity" jdbcType="VARCHAR"/>
+        <result property="identityTimeStart" column="identity_time_start" jdbcType="VARCHAR"/>
+        <result property="identityTimeEnd" column="identity_time_end" jdbcType="VARCHAR"/>
+        <result property="logoutTime" column="logout_time" jdbcType="DATE"/>
+        <result property="headSculpture" column="head_sculpture" jdbcType="VARCHAR"/>
+        <result property="factorVerify" column="factor_verify" jdbcType="TINYINT"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="nations" column="nations" jdbcType="VARCHAR"/>
+        <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
+        <result property="bankCardId" column="bank_card_id" jdbcType="VARCHAR"/>
+        <result property="koseki" column="koseki" jdbcType="VARCHAR"/>
+        <result property="birthday" column="birthday" jdbcType="DATE"/>
+        <result property="maritalStatus" column="marital_status" jdbcType="VARCHAR"/>
+        <result property="politicsStatus" column="politics_status" jdbcType="VARCHAR"/>
+        <result property="health" column="health" jdbcType="VARCHAR"/>
+        <result property="postalCode" column="postal_code" jdbcType="VARCHAR"/>
+        <result property="bloodType" column="blood_type" jdbcType="VARCHAR"/>
+        <result property="education" column="education" jdbcType="VARCHAR"/>
+        <result property="school" column="school" jdbcType="VARCHAR"/>
+        <result property="graduationTime" column="graduation_time" jdbcType="DATE"/>
+        <result property="isComputer" column="is_computer" jdbcType="TINYINT"/>
+        <result property="formerEmployer" column="former_employer" jdbcType="VARCHAR"/>
+        <result property="entryTime" column="entry_time" jdbcType="DATE"/>
+        <result property="agentQualificationCode" column="agent_qualification_code" jdbcType="VARCHAR"/>
+        <result property="emergencyContactTel" column="emergency_contact_tel" jdbcType="VARCHAR"/>
+        <result property="emergencyContactName" column="emergency_contact_name" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="sex" column="sex" jdbcType="VARCHAR"/>
+        <result property="speciality" column="speciality" jdbcType="VARCHAR"/>
+        <result property="salary" column="salary" jdbcType="DECIMAL"/>
+        <result property="salaryLevel" column="salary_level" jdbcType="VARCHAR"/>
+        <result property="liveAddress" column="live_address" jdbcType="VARCHAR"/>
+        <result property="province" column="province" jdbcType="VARCHAR"/>
+        <result property="city" column="city" jdbcType="VARCHAR"/>
+        <result property="district" column="district" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -75,6 +75,10 @@
     </sql>
     <!-- 一个业务员可能存在于多个租户 lipf 2026年4月24日17:56:31  -->
     <select id="queryJzgInfoByUserId" resultMap="BaseResultMap">
-        select * from sys_user_jzg_info a where a.user_id  = #{userId,jdbcType=DECIMAL} and a.is_delete = 0
+        select * from sys_user_jzg_info a
+        <where>
+            a.user_id = #{userId,jdbcType=DECIMAL}
+            and a.is_delete = 0
+        </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -5,24 +5,24 @@
 <mapper namespace="com.jzg.mapper.SysUserMapper">
 
     <resultMap id="SysUserResult" type="com.jzg.commons.entity.po.SysUser">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="username" column="username" jdbcType="VARCHAR"/>
-            <result property="password" column="password" jdbcType="VARCHAR"/>
-            <result property="salt" column="salt" jdbcType="VARCHAR"/>
-            <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
-            <result property="accountStatus" column="account_status" jdbcType="TINYINT"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="username" column="username" jdbcType="VARCHAR"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="salt" column="salt" jdbcType="VARCHAR"/>
+        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+        <result property="accountStatus" column="account_status" jdbcType="TINYINT"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="selectUserVo">
         SELECT id,username,password,
-        salt,mobile,account_status,
-        create_by,create_time,update_by,
-        update_time,is_delete
+               salt,mobile,account_status,
+               create_by,create_time,update_by,
+               update_time,is_delete
         FROM sys_user
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.SysUserVo">
@@ -31,15 +31,15 @@
         sr.create_by,sr.create_time,sr.update_by,
         sr.update_time,sr.is_delete,si.is_enable as isEnable
         FROM sys_user sr
-        LEFT JOIN sys_user_plate_info si on sr.id = si.user_id
+        LEFT JOIN sys_user_plate_info si on sr.id = si.user_id AND si.is_delete = 0
         <where>
+            and sr.is_delete = 0 and si.system_code = 'PLATFORM'
             <if test="param.isEnable != null">
                 and si.is_enable = #{param.isEnable}
             </if>
             <if test="param.searchValue != null and param.searchValue != ''">
                 and ( sr.username = #{param.searchValue} or sr.mobile = #{param.searchValue} or sr.id = #{param.searchValue})
             </if>
-             and sr.is_delete = 0 and si.system_code = 'PLATFORM'
         </where>
         ORDER BY create_time DESC
     </select>
@@ -49,14 +49,15 @@
         *
         FROM
         sys_user su
-        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
-        WHERE
-        1=1
-        <if test="param.id != null and param.id != ''">
-            AND su.id = #{param.id}
-        </if>
-        <if test="param.deptId != null and param.deptId != ''">
-            AND suji.dept_id = #{param.deptId}
-        </if>
+        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id AND suji.is_delete = 0
+        <where>
+            AND su.is_delete = 0
+            <if test="param.id != null and param.id != ''">
+                AND su.id = #{param.id}
+            </if>
+            <if test="param.deptId != null and param.deptId != ''">
+                AND suji.dept_id = #{param.deptId}
+            </if>
+        </where>
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -3,19 +3,21 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.mapper.SysUserRoleMapper">
-    <delete id="deleteByUserId">
+    <!--<delete id="deleteByUserId">
         delete from sys_user_role where user_id = #{userId}
-    </delete>
+    </delete>-->
 
     <select id="selectByUserIdAndSysCodeOne" resultType="com.jzg.commons.entity.po.SysUserRole">
         SELECT
-            ur.*
+        ur.*
         FROM
-            sys_user_role ur
-                LEFT JOIN sys_role r ON  r.id = ur.role_id
-        WHERE
+        sys_user_role ur
+        LEFT JOIN sys_role r ON r.id = ur.role_id AND r.is_delete = 0
+        <where>
             ur.is_delete = 0
-          AND ur.user_id = #{userId} AND r.system_code = #{systemCode}
+            AND ur.user_id = #{userId}
+            AND r.system_code = #{systemCode}
+        </where>
     </select>
 
-</mapper>
+</mapper>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -66,7 +66,8 @@
         WHEN 1 THEN '是'
         ELSE ''
         END AS isProblem,
-        io.order_source
+        io.order_source,
+        ioci.vin_no
         FROM ins_fee_audit ifa
         LEFT JOIN ins_orders io on ifa.order_no = io.id AND io.is_delete=0
         LEFT JOIN ins_orders_car_info ioci on io.id = ioci.order_no AND ioci.is_delete=0
@@ -80,6 +81,9 @@
         LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id AND ioep.is_delete=0
         <where>
             and ifa.is_delete=0 and ifa.system_code = #{param.systemCode}
+            <if test="param.vinNo != null and param.vinNo !=''">
+                and ioci.vin_no = #{param.vinNo}
+            </if>
             <if test="param.receiveUser != null and param.receiveUser != ''">
                 and ifa.receive_user = #{param.receiveUser}
             </if>

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -520,7 +520,7 @@ public class ReceivableController {
             receivableQueryVo.setAgreementType("2");
         }
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
-            receivableQueryVo.setQueryType("1");
+            receivableQueryVo.setQueryType("2");
         }
         receivableService.exportSuperviseExcel(receivableQueryVo);
     }

tenant/organization/src/main/java/com/jzg/organization/entity/WechatCustomerService.java

@@ -1,9 +1,7 @@
 package com.jzg.organization.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.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -84,4 +82,8 @@ public class WechatCustomerService implements Serializable {
     @Schema(description = "更新时间")
     private LocalDateTime updateTime;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }

tenant/organization/src/main/java/com/jzg/organization/entity/WechatCustomerServiceDuty.java

@@ -1,7 +1,9 @@
 package com.jzg.organization.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -64,5 +66,9 @@ public class WechatCustomerServiceDuty implements Serializable {
     @Schema(description = "值班客服id")
     private Long dutyCustomerServiceId;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/InsPlyIncomeInvoiceLinkMapper.java

@@ -5,8 +5,18 @@ import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceLink;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface InsPlyIncomeInvoiceLinkMapper extends BaseMapper<InsPlyIncomeInvoiceLink> {
 
+    /**
+     * 删除发票和订单的关联关系
+     *
+     * @author lipf
+     * @date 2026/5/29 14:29
+     */
+    @Update("UPDATE ins_ply_income_invoice_link SET is_delete = 1 WHERE invoice_id = #{invoiceId} AND is_delete = 0")
+    void deleteByInvoiceId(@Param("invoiceId") String invoiceId);
+
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/InvAccountCardMapper.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.account.vo.AccountCardVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
 * @author dongxin
 * @description 针对表【inv_account_card(账户信息表)】的数据库操作Mapper
@@ -35,13 +33,13 @@ public interface InvAccountCardMapper extends BaseMapper<InvAccountCard> {
     /**
      * 查询业务员提现银行卡信息
      *
-     * @param systemCode 租户代码
-     * @param accountId 银行卡号
+     * @param systemCode    租户代码
+     * @param accountCardId 银行卡的序号
      * @author lipf
      * @date 2026/6/8 15:14
      */
-    List<InvAccountCard> queryByAccountId(@Param("accountId") String accountId,
-                                          @Param("systemCode") String systemCode);
+    InvAccountCard queryByAccountCardId(@Param("accountCardId") String accountCardId,
+                                        @Param("systemCode") String systemCode);
 
 }
 

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementCostExternalMapper.java

@@ -26,5 +26,5 @@ public interface  PtlAgreementCostExternalMapper extends BaseMapper<PtlAgreement
 
     List<CostExternalListVo> selectByAgreementIdAll(CostExternalParam costExternalParam);
 
-    void deleteByIAgreementId(CostExternalEnd costExternalEnd);
+//    void deleteByIAgreementId(CostExternalEnd costExternalEnd);
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlSchemeInsuranceDrivingIntentionMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.scheme.po.PtlSchemeInsurance;
 import com.jzg.commons.entity.scheme.po.PtlSchemeInsuranceDrivingIntention;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,5 +12,5 @@ import java.util.List;
 public interface PtlSchemeInsuranceDrivingIntentionMapper extends BaseMapper<PtlSchemeInsuranceDrivingIntention> {
 
 
-    public List<PtlSchemeInsuranceDrivingIntention> getSchemeDrivingIntention(String schemeInfoId);
+    public List<PtlSchemeInsuranceDrivingIntention> getSchemeDrivingIntention(@Param("schemeId") String schemeInfoId);
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserRoleMapper.java

@@ -21,5 +21,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      * @param userId
      * @return
      */
-    boolean deleteByUserId(@Param("userId") String userId,@Param("roleIds") List<String> roleIds);
+//    boolean deleteByUserId(@Param("userId") String userId,@Param("roleIds") List<String> roleIds);
 }

tenant/organization/src/main/java/com/jzg/organization/service/InvAccountCardService.java

@@ -8,8 +8,6 @@ import com.jzg.commons.entity.account.po.InvAccountCard;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.account.vo.AccountCardVo;
 
-import java.util.List;
-
 /**
 * @author dongxin
 * @description 针对表【inv_account_card(账户信息表)】的数据库操作Service
@@ -61,8 +59,10 @@ public interface InvAccountCardService extends IService<InvAccountCard> {
     /**
      * 根据银行卡账号查询银行卡信息
      *
+     * @param systemCode    租户代码
+     * @param accountCardId 付款账号的id
      * @author lipf
      * @date 2026/6/8 15:12
      */
-    List<InvAccountCard> queryByAccountId(String accountId, String systemCode);
+    InvAccountCard queryByAccountCardId(String accountCardId, String systemCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -329,7 +329,14 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      */
     HttpResult<List<InsPlyIncome>> queryIncomeDatas(IncomeDataVO incomeDataVO);
 
-    Boolean deleteInvoiceById(String id);
+    /**
+     * 删除发票信息(便于重新开票)
+     *
+     * @param invoiceId 发票序号
+     * @author lipf
+     * @date 2026/6/9 9:13
+     */
+    Boolean deleteInvoiceById(String invoiceId);
 
     /**
      * 查询订单绑定的发票信息

tenant/organization/src/main/java/com/jzg/organization/service/impl/InvAccountCardServiceImpl.java

@@ -19,8 +19,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
 * @author dongxin
 * @description 针对表【inv_account_card(账户信息表)】的数据库操作Service实现
@@ -80,15 +78,15 @@ public class InvAccountCardServiceImpl extends ServiceImpl<InvAccountCardMapper,
     /**
      * 根据银行卡账号查询银行卡信息
      *
-     * @param accountId  租户银行卡的账号
-     * @param systemCode 租户代码
+     * @param accountCardId 租户银行卡的账号
+     * @param systemCode    租户代码
      * @author lipf
      * @date 2026/6/8 15:12
      */
     @Override
-    public List<InvAccountCard> queryByAccountId(String accountId, String systemCode) {
-        log.info("根据企业账号查询业务的付款账户信息。 accountId=[{}], systemCode=[{}]", accountId, systemCode);
-        return baseMapper.queryByAccountId(accountId, systemCode);
+    public InvAccountCard queryByAccountCardId(String accountCardId, String systemCode) {
+        log.info("根据企业账号查询业务的付款账户信息。 accountId=[{}], systemCode=[{}]", accountCardId, systemCode);
+        return baseMapper.queryByAccountCardId(accountCardId, systemCode);
     }
 }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
@@ -26,7 +25,6 @@ import com.jzg.commons.entity.finance.po.*;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.po.EsmInsCompany;
-import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
@@ -539,10 +537,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteInvoiceById(String id) {
-        log.info("私有协议-开票记录-删除： id=[{}]",id);
-        insPlyIncomeInvoiceLinkMapper.deleteById(id);
-        return insPlyIncomeInvoiceMapper.deleteById(id) > 0;
+    public Boolean deleteInvoiceById(String invoiceId) {
+        log.info("私有协议-开票记录-删除： id=[{}]", invoiceId);
+        insPlyIncomeInvoiceLinkMapper.deleteByInvoiceId(invoiceId);
+        return insPlyIncomeInvoiceMapper.deleteById(invoiceId) > 0;
     }
 
 
@@ -553,44 +551,50 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      * @date 2026/5/11 11:37
      */
     List<InsPlyIncome> fillOtherInfo(List<InsPlyIncome> records){
-        if(CollUtil.isNotEmpty(records)){
-            List<String> incomeIds = records.stream().map(InsPlyIncome::getId).toList();
-            InvoicingVo invoicingVo = new InvoicingVo();
-            invoicingVo.setIncomeIds(incomeIds);
-            List<InsPlyIncomeInvoiceLink> links = baseMapper.queryIncomeBindInvoice(invoicingVo);
-            Map<String, String> income2InvoceIdMap = links.stream()
-                    .filter(action -> StrUtil.isNotEmpty(action.getIncomeId()))
-                    .collect(Collectors.toMap(InsPlyIncomeInvoiceLink::getIncomeId, InsPlyIncomeInvoiceLink::getInvoiceId, (oleItem, newItem) -> oleItem));
-
-
-            Map<String, String> typeAttrMaps = sysUserJzgInfoSalesmanService.queryYwyTypeAttrMap();
-            records.forEach(insPlyIncome -> {
-                if("0".equals(insPlyIncome.getSettlementStatus())){
-                    insPlyIncome.setSettlementStatusName("未结算");
-                }else if("1".equals(insPlyIncome.getSettlementStatus())){
-                    insPlyIncome.setSettlementStatusName("已结算");
-                }else{
-                    insPlyIncome.setSettlementStatusName(insPlyIncome.getSettlementStatus());
-                }
-                String typeAttr = typeAttrMaps.getOrDefault(Objects.toString(insPlyIncome.getRealQuoteUserName(),""),"");
-                String typeAttrName = Constant.ywyAttrTypeMap.get(typeAttr);
-                insPlyIncome.setTypeAttr(typeAttr);
-                insPlyIncome.setTypeAttrName(typeAttrName);
-                // 费用信息, 这里添加费用，性能会很慢
+        if(CollUtil.isEmpty(records)){
+            return records;
+        }
+        List<String> incomeIds = records.stream().map(InsPlyIncome::getId).toList();
+        InvoicingVo invoicingVo = new InvoicingVo();
+        invoicingVo.setIncomeIds(incomeIds);
+        List<InsPlyIncomeInvoiceLink> links = baseMapper.queryIncomeBindInvoice(invoicingVo);
+        Map<String, String> income2InvoceIdMap = links.stream()
+                .filter(action -> StrUtil.isNotEmpty(action.getIncomeId()))
+                .collect(Collectors.toMap(InsPlyIncomeInvoiceLink::getIncomeId, InsPlyIncomeInvoiceLink::getInvoiceId, (oleItem, newItem) -> oleItem));
+
+
+        Map<String, String> typeAttrMaps = sysUserJzgInfoSalesmanService.queryYwyTypeAttrMap();
+        records.forEach(insPlyIncome -> {
+            if("0".equals(insPlyIncome.getSettlementStatus())){
+                insPlyIncome.setSettlementStatusName("未结算");
+            }else if("1".equals(insPlyIncome.getSettlementStatus())){
+                insPlyIncome.setSettlementStatusName("已结算");
+            }else{
+                insPlyIncome.setSettlementStatusName(insPlyIncome.getSettlementStatus());
+            }
+            String typeAttr = typeAttrMaps.getOrDefault(Objects.toString(insPlyIncome.getRealQuoteUserName(),""),"");
+            String typeAttrName = Constant.ywyAttrTypeMap.get(typeAttr);
+            insPlyIncome.setTypeAttr(typeAttr);
+            insPlyIncome.setTypeAttrName(typeAttrName);
+            // 费用信息, 这里添加费用，性能会很慢
 //                List<InsFeeOrders> insFeeOrderByOrderNo = insFeeOrdersClient.getInsFeeOrderByOrderNo(insPlyIncome.getOrderNo());
 //                insPlyIncome.setInsFeeOrders(CollUtil.getFirst(insFeeOrderByOrderNo));
 
-                String invoiceId = income2InvoceIdMap.get(insPlyIncome.getId());
-                insPlyIncome.setInvoiceStatusName(StrUtil.isEmpty(invoiceId)? "未开票":"已开票");
-                insPlyIncome.setInvoiceId(invoiceId);
-            });
-        }
+            String invoiceId = income2InvoceIdMap.get(insPlyIncome.getId());
+            insPlyIncome.setInvoiceStatusName(StrUtil.isEmpty(invoiceId)? "未开票":"已开票");
+            insPlyIncome.setInvoiceId(invoiceId);
+        });
         return records;
     }
 
     @Override
     public List<InsPlyIncome> getReceivableList(ReceivableQueryVo receivableQueryVo) {
-        return baseMapper.getReceivableList(receivableQueryVo);
+        // modify by lipf, 和查询调用同一个查询mapper，并且将分页参数进行调整 2026年6月9日10:03:13
+        receivableQueryVo.setPages(1);
+        receivableQueryVo.setSize(Integer.MAX_VALUE);
+        Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        //return baseMapper.getReceivableList(receivableQueryVo);
+        return page.getRecords();
     }
 
 
@@ -1083,7 +1087,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             }
 
             // 判断是否已经结算完成, 考虑回款差额
-            if (surplusPremium.compareTo(settlementVo.getActualReceivedAmount().add(platformSettlementVo.getSettlementVo().getSettlementPaymentDifference())) == 0) {
+            if (surplusPremium.compareTo(BigDecimalUtil.add(settlementVo.getActualReceivedAmount(), platformSettlementVo.getSettlementVo().getSettlementPaymentDifference())) == 0) {
                 log.info("序号为[{}]的发票已经结算完成",invoice.getId());
                 // 更新发票状态
                 invoice.setStatus("1");
@@ -1091,7 +1095,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 // 判断是需要更新哪个字段
                 this.updateIncomeSettlementStatus(invoice.getInvoiceType(), invoicingVo.getIncomeIds(), settlementDateTime);
             }else{
-                log.info("invoiceId=[{}]， 还剩[{}]钱没有结算",settlementVo.getInvoicingId(), surplusPremium.subtract(settlementVo.getActualReceivedAmount()));
+                log.info("invoiceId=[{}]还剩[{}]钱没有结算",settlementVo.getInvoicingId(), surplusPremium.subtract(settlementVo.getActualReceivedAmount()));
             }
             return true;
         } catch (Exception e) {
@@ -2920,7 +2924,20 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
         verifyUploadPath();
-        List<ExportOtherExcelDto> exportOtherExcelDtos = baseMapper.getOtherExcelDtos(receivableQueryVo);
+        // modify by lipf, 2026年6月9日11:57:39 调用和查询相同的接口，保证数据一致性
+        //List<ExportOtherExcelDto> exportOtherExcelDtos = baseMapper.getOtherExcelDtos(receivableQueryVo);
+        receivableQueryVo.setSize(Integer.MAX_VALUE);
+        receivableQueryVo.setPages(1);
+        Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        List<InsPlyIncome> records = page.getRecords();
+        List<ExportOtherExcelDto> exportOtherExcelDtos = new ArrayList<>();
+        if(CollUtil.isNotEmpty(records)){
+            exportOtherExcelDtos = records.stream().map(action->{
+                ExportOtherExcelDto dto = new  ExportOtherExcelDto();
+                BeanUtils.copyProperties(action,dto);
+                return dto;
+            }).toList();
+        }
         exportOtherExcelDtos.forEach(dto -> {
             switch (dto.getEntryStatus()) {
                 case "1" -> dto.setEntryStatus("车险订单");

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -194,7 +194,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         String userId = baseController.getUserId();
         String systemCode = baseController.getSystemCode();
         log.info("用户开始进行付款操作。userName=[{}],param=[{}]systemCode=[{}]",userName,JSONUtil.toJsonStr(param),systemCode);
-        if(StrUtil.isEmpty(param.getAccountId())){
+        if(StrUtil.isEmpty(param.getCardId())){
             return HttpResult.error("付款账户不能为空");
         }
         SysAmountAuditing audit = this.getById(param.getId());
@@ -205,7 +205,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 audit.setAuditingStatus(stateFailResult.getCurrentState());
                 audit.setPicId(param.getPicId());
                 audit.setVoucherId(param.getVoucherId());
-                audit.setAccountId(param.getAccountId());
+                audit.setAccountId(param.getCardId());
                 audit.setPaymentTime(LocalDateTime.now());
                 audit.setAuditingTime(LocalDateTime.now());
                 audit.setAuditingUserId(userId);
@@ -306,12 +306,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             }
         }
         changeLog.setUserId(ywyUserId);
-        List<InvAccountCard> accountCardVos = invAccountCardService.queryByAccountId(param.getAccountId(), systemCode);
-        if(CollUtil.size(accountCardVos) > 1){
-            throw new SystemException(String.format("租户%s下根据账号%s找到%d条",systemCode,param.getAccountId(),accountCardVos.size()));
-        }
-        if(CollUtil.isNotEmpty(accountCardVos)){
-            InvAccountCard accountCardVo = accountCardVos.get(0);
+        InvAccountCard accountCardVo = invAccountCardService.queryByAccountCardId(param.getCardId(), systemCode);
+        if(accountCardVo != null){
             changeLog.setBankCardIdIn(accountCardVo.getId());
             changeLog.setBankCardNoIn(accountCardVo.getBankCardNum());
         }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -229,11 +229,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             LambdaQueryWrapper<SysUserJzgInfo> infoWrapper = new LambdaQueryWrapper<>();
             infoWrapper.eq(SysUserJzgInfo::getUserId, yqrAppUser.getUserId());
             infoWrapper.eq(SysUserJzgInfo::getSystemCode, param.getSystemCode());
-            SysUserJzgInfo yqirInfo = sysUserJzgInfoService.getOne(infoWrapper);
-            if (Objects.isNull(yqirInfo)) {
+            SysUserJzgInfo yqrInfo = sysUserJzgInfoService.getOne(infoWrapper);
+            if (Objects.isNull(yqrInfo)) {
                 throw new SystemException("邀请人数据异常！");
             }
-            SysDept dept = sysDeptMapper.selectById(yqirInfo.getDeptId());
+            SysDept dept = sysDeptMapper.selectById(yqrInfo.getDeptId());
+            String leaderId = yqrInfo.getLeaderId();
             AssertionUtils.isFail(Objects.isNull(dept), "邀请人所在部门不存在");
             invitationVo.setDeptName(dept.getName());
             invitationVo.setMobile(param.getMobile());
@@ -256,11 +257,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 sysUserJzgApp.setDeptId(yqrAppUser.getDeptId());
                 sysUserJzgApp.setSystemCode(systemCode);
                 sysUserJzgApp.setReferrerId(yqrAppUser.getId());
+                sysUserJzgApp.setLeaderId(leaderId);
                 sysUserJzgAppMapper.insert(sysUserJzgApp);
 
                 // 增加推荐人关系
                 this.addRelationPerson(yqrAppUser, sysUserJzgApp);
-                SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, sysUser);
+                SysUserJzgInfo userInfo = new SysUserJzgInfo(yqrInfo, sysUser);
                 sysUserJzgInfoService.save(userInfo);
                 userId = userInfo.getId();
                 invitationVo.setIsJoined(0);
@@ -280,7 +282,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                     sysUserJzgAppMapper.insert(sysUserJzgApp);
                     // 增加推荐人关系
                     this.addRelationPerson(yqrAppUser, sysUserJzgApp);
-                    SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, user);
+                    SysUserJzgInfo userInfo = new SysUserJzgInfo(yqrInfo, user);
                     sysUserJzgInfoService.save(userInfo);
                     userId = userInfo.getId();
                     log.info("被邀请人在sys_user_jzg_app表中的序号是[{}]",userId);
@@ -294,7 +296,17 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 }
                 sysUserId = user.getId();
             }
-            teamInvitation(yqirInfo, param, userId, sysUserId);
+            // add by lipf 2026年6月9日15:16:39 向 sys_user_jzg_info_salesman 表中插入一条记录 
+            SysUserJzgInfoSalesman salesman = new SysUserJzgInfoSalesman();
+            salesman.setSysUserJzgInfoId(userId);
+            salesman.setTypeAttr("6");
+            salesman.setIsDelete(0);
+            salesman.setCreateBy("sys");
+            salesman.setCreateTime(LocalDateTime.now());
+            salesman.setUpdateBy("sys");
+            salesman.setUpdateTime(LocalDateTime.now());
+            sysUserJzgInfoSalesmanService.save(salesman);
+            this.teamInvitation(yqrInfo, param, userId, sysUserId);
             return invitationVo;
         } catch (Exception e) {
             log.error("invitationRegister",e);

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserRoleServiceImpl.java

@@ -37,6 +37,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 
     @Override
     public boolean deleteByUserId(String userId,List<String> roleIds) {
-        return baseMapper.deleteByUserId(userId,roleIds);
+//        return baseMapper.deleteByUserId(userId,roleIds);
+        // 定义查询条件
+        LambdaQueryWrapper<SysUserRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserRole::getUserId, userId)
+                .in(SysUserRole::getRoleId, roleIds);
+        // 执行删除操作，返回受影响的行数
+        return baseMapper.delete(lambdaQueryWrapper) > 0;
     }
 }

tenant/organization/src/main/resources/mapper/InsBusinessInsuranceMapper.xml

@@ -20,35 +20,40 @@
 
     <select id="getBusinessInsuranceList" resultMap="SchemeResultVoMap">
         SELECT
-            ibi.power_id,
-            ibi.kind_code,
-            ibi.kind_name,
-            ibi.alias,
-            ibi.grouping,
-            ibio.id,
-            ibio.business_id,
-            ibio.label,
-            ibio.`value`,
-            ibio.sort
+        ibi.power_id,
+        ibi.kind_code,
+        ibi.kind_name,
+        ibi.alias,
+        ibi.grouping,
+        ibio.id,
+        ibio.business_id,
+        ibio.label,
+        ibio.`value`,
+        ibio.sort
         FROM
-            ins_business_insurance ibi
-                LEFT JOIN ins_business_insurance_option ibio ON ibi.id = ibio.business_id
-        WHERE
-            1=1
-        <if test="productId == '0330'">
-            AND ibi.type = 1
-        </if>
-        <if test="productId == '0330034002' or productId == '0330034001'">
-            AND ibi.type = 1 or ibi.type = 2
-        </if>
-        <if test="productId == '034001' or productId == '034002'">
-            AND ibi.type = 2
-        </if>
+        ins_business_insurance ibi
+        LEFT JOIN ins_business_insurance_option ibio ON ibi.id = ibio.business_id AND ibio.is_delete = 0
+        <where>
+            ibi.is_delete = 0
+            <if test="productId == '0330'">
+                AND ibi.type = 1
+            </if>
+            <if test="productId == '0330034002' or productId == '0330034001'">
+                AND ibi.type = 1 or ibi.type = 2
+            </if>
+            <if test="productId == '034001' or productId == '034002'">
+                AND ibi.type = 2
+            </if>
+        </where>
     </select>
 
     <select id="getBusinessInsuranceOptionList" resultType="com.jzg.commons.entity.scheme.po.InsBusinessInsuranceOption">
         select * from ins_business_insurance_option
+        <where>
+            is_delete = 0
+        </where>
     </select>
+
     <select id="getBusinessInsuranceListByKindType" resultMap="SchemeResultVoMap">
         SELECT
         ibi.power_id,
@@ -63,11 +68,12 @@
         ibio.sort
         FROM
         ins_business_insurance ibi
-        LEFT JOIN ins_business_insurance_option ibio ON ibi.id = ibio.business_id
-        WHERE
-        1=1
-        <if test="kindCode != null and kindCode != ''">
-            AND ibi.kind_code = #{kindCode}
-        </if>
+        LEFT JOIN ins_business_insurance_option ibio ON ibi.id = ibio.business_id AND ibio.is_delete = 0
+        <where>
+            ibi.is_delete = 0
+            <if test="kindCode != null and kindCode != ''">
+                AND ibi.kind_code = #{kindCode}
+            </if>
+        </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/InvAccountCardMapper.xml

@@ -5,35 +5,35 @@
 <mapper namespace="com.jzg.organization.mapper.InvAccountCardMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.account.po.InvAccountCard">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="cardName" column="card_name" jdbcType="VARCHAR"/>
-            <result property="bankCardNum" column="bank_card_num" jdbcType="VARCHAR"/>
-            <result property="accountId" column="account_id" jdbcType="BIGINT"/>
-            <result property="accountQuality" column="account_quality" jdbcType="INTEGER"/>
-            <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
-            <result property="bank" column="bank" jdbcType="VARCHAR"/>
-            <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
-            <result property="startCertExpirationDate" column="start_cert_expiration_date" jdbcType="TIMESTAMP"/>
-            <result property="endCertExpirationDate" column="end_cert_expiration_date" jdbcType="TIMESTAMP"/>
-            <result property="balance" column="balance" jdbcType="VARCHAR"/>
-            <result property="spend" column="spend" jdbcType="VARCHAR"/>
-            <result property="dayStrokeNum" column="day_stroke_num" jdbcType="VARCHAR"/>
-            <result property="dayStrokeNumExcess" column="day_stroke_num_excess" jdbcType="VARCHAR"/>
-            <result property="priDayLines" column="pri_day_lines" jdbcType="VARCHAR"/>
-            <result property="priSingleLines" column="pri_single_lines" jdbcType="VARCHAR"/>
-            <result property="priDayLinesExcess" column="pri_day_lines_excess" jdbcType="VARCHAR"/>
-            <result property="priYearLines" column="pri_year_lines" jdbcType="VARCHAR"/>
-            <result property="priYearExcess" column="pri_year_excess" jdbcType="VARCHAR"/>
-            <result property="pubSingleLines" column="pub_single_lines" jdbcType="VARCHAR"/>
-            <result property="pubYearLines" column="pub_year_lines" jdbcType="VARCHAR"/>
-            <result property="pubDayLines" column="pub_day_lines" jdbcType="VARCHAR"/>
-            <result property="pubYearExcess" column="pub_year_excess" jdbcType="VARCHAR"/>
-            <result property="pubDayLinesExcess" column="pub_day_lines_excess" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="cardName" column="card_name" jdbcType="VARCHAR"/>
+        <result property="bankCardNum" column="bank_card_num" jdbcType="VARCHAR"/>
+        <result property="accountId" column="account_id" jdbcType="BIGINT"/>
+        <result property="accountQuality" column="account_quality" jdbcType="INTEGER"/>
+        <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
+        <result property="bank" column="bank" jdbcType="VARCHAR"/>
+        <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
+        <result property="startCertExpirationDate" column="start_cert_expiration_date" jdbcType="TIMESTAMP"/>
+        <result property="endCertExpirationDate" column="end_cert_expiration_date" jdbcType="TIMESTAMP"/>
+        <result property="balance" column="balance" jdbcType="VARCHAR"/>
+        <result property="spend" column="spend" jdbcType="VARCHAR"/>
+        <result property="dayStrokeNum" column="day_stroke_num" jdbcType="VARCHAR"/>
+        <result property="dayStrokeNumExcess" column="day_stroke_num_excess" jdbcType="VARCHAR"/>
+        <result property="priDayLines" column="pri_day_lines" jdbcType="VARCHAR"/>
+        <result property="priSingleLines" column="pri_single_lines" jdbcType="VARCHAR"/>
+        <result property="priDayLinesExcess" column="pri_day_lines_excess" jdbcType="VARCHAR"/>
+        <result property="priYearLines" column="pri_year_lines" jdbcType="VARCHAR"/>
+        <result property="priYearExcess" column="pri_year_excess" jdbcType="VARCHAR"/>
+        <result property="pubSingleLines" column="pub_single_lines" jdbcType="VARCHAR"/>
+        <result property="pubYearLines" column="pub_year_lines" jdbcType="VARCHAR"/>
+        <result property="pubDayLines" column="pub_day_lines" jdbcType="VARCHAR"/>
+        <result property="pubYearExcess" column="pub_year_excess" jdbcType="VARCHAR"/>
+        <result property="pubDayLinesExcess" column="pub_day_lines_excess" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -51,7 +51,7 @@
     <select id="queryPage" resultType="com.jzg.commons.entity.account.vo.AccountCardVo">
         select <include refid="Base_Column_List"/>
         FROM inv_account_card iac
-        LEFT JOIN inv_account ia on ia.id = iac.account_id
+        LEFT JOIN inv_account ia on ia.id = iac.account_id AND ia.is_delete = 0
         <where>
             iac.is_delete = 0
             <if test="param.accountName != null and param.accountName != ''">
@@ -72,7 +72,7 @@
     <select id="queryById" resultType="com.jzg.commons.entity.account.vo.AccountCardVo">
         select <include refid="Base_Column_List"/>
         FROM inv_account_card iac
-        LEFT JOIN inv_account ia on ia.id = iac.account_id
+        LEFT JOIN inv_account ia on ia.id = iac.account_id AND ia.is_delete = 0
         <where>
             iac.is_delete = 0
             <if test="id != null and id != ''">
@@ -81,7 +81,12 @@
         </where>
     </select>
     <!-- 查询业务员提现银行卡信息 lipf 2026年6月8日15:16:59 -->
-    <select id="queryByAccountId" resultType="com.jzg.commons.entity.account.po.InvAccountCard">
-        select * from inv_account_card iac where iac.account_id = #{accountId} and iac.system_code = #{systemCode}
+    <select id="queryByAccountCardId" resultType="com.jzg.commons.entity.account.po.InvAccountCard">
+        select * from inv_account_card iac
+        <where>
+            iac.id = #{accountCardId}
+            and iac.system_code = #{systemCode}
+            and iac.is_delete = 0
+        </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/InvAccountMapper.xml

@@ -5,24 +5,24 @@
 <mapper namespace="com.jzg.organization.mapper.InvAccountMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.account.po.InvAccount">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="accountName" column="account_name" jdbcType="VARCHAR"/>
-            <result property="outerFlag" column="outer_flag" jdbcType="INTEGER"/>
-            <result property="businessQuality" column="business_quality" jdbcType="INTEGER"/>
-            <result property="owned" column="owned" jdbcType="VARCHAR"/>
-            <result property="juridicalPerson" column="juridical_person" jdbcType="VARCHAR"/>
-            <result property="establishTime" column="establish_time" jdbcType="TIMESTAMP"/>
-            <result property="biller" column="biller" jdbcType="VARCHAR"/>
-            <result property="invoicingAmount" column="invoicing_amount" jdbcType="VARCHAR"/>
-            <result property="invoicingAmountExcess" column="invoicing_amount_excess" jdbcType="VARCHAR"/>
-            <result property="quarterInvoicingAmount" column="quarter_invoicing_amount" jdbcType="VARCHAR"/>
-            <result property="sumInvoicingAmount" column="sum_invoicing_amount" jdbcType="VARCHAR"/>
-            <result property="tentativeEstimates" column="tentative_estimates" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="accountName" column="account_name" jdbcType="VARCHAR"/>
+        <result property="outerFlag" column="outer_flag" jdbcType="INTEGER"/>
+        <result property="businessQuality" column="business_quality" jdbcType="INTEGER"/>
+        <result property="owned" column="owned" jdbcType="VARCHAR"/>
+        <result property="juridicalPerson" column="juridical_person" jdbcType="VARCHAR"/>
+        <result property="establishTime" column="establish_time" jdbcType="TIMESTAMP"/>
+        <result property="biller" column="biller" jdbcType="VARCHAR"/>
+        <result property="invoicingAmount" column="invoicing_amount" jdbcType="VARCHAR"/>
+        <result property="invoicingAmountExcess" column="invoicing_amount_excess" jdbcType="VARCHAR"/>
+        <result property="quarterInvoicingAmount" column="quarter_invoicing_amount" jdbcType="VARCHAR"/>
+        <result property="sumInvoicingAmount" column="sum_invoicing_amount" jdbcType="VARCHAR"/>
+        <result property="tentativeEstimates" column="tentative_estimates" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -74,4 +74,4 @@
         </where>
     </select>
 
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/NewCarJudgeRulesMapper.xml

@@ -2,15 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.organization.mapper.NewCarJudgeRulesMapper">
 
-
     <select id="getNewCarList" resultType="com.jzg.commons.entity.po.PtlNewCarJudgeRules">
         select
-            pncjr.*,
-            eic.name as company_name
+        pncjr.*,
+        eic.name as company_name
         from
-            ptl_new_car_judge_rules pncjr
-        left join esm_ins_company eic on eic.id = pncjr.company_id
+        ptl_new_car_judge_rules pncjr
+        left join esm_ins_company eic on eic.id = pncjr.company_id and eic.is_delete = 0
+        <where>
+            pncjr.is_delete = 0
+        </where>
     </select>
 
-
 </mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementCostExternalMapper.xml

@@ -60,7 +60,7 @@
             pa.agreement_title, ce.priority_level
         FROM
             ptl_agreement_cost_external ce
-            LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id
+                LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id AND pa.is_delete = 0
     </sql>
 
     <sql id="Base_Column_type">
@@ -70,37 +70,49 @@
             ptl_agreement_cost_external_type
     </sql>
 
-    <delete id="deleteByIAgreementId">
+    <!--<delete id="deleteByIAgreementId">
         DELETE FROM ptl_agreement_cost_external WHERE ptl_agreement_id = #{ptlAgreementId} AND contact_mobile = #{contactMobile}
-    </delete>
+    </delete>-->
 
 
     <select id="selectById" resultMap="CostExternalListVoMap">
-        <include refid="Base_Column" /> WHERE ce.id = #{id}
+        <include refid="Base_Column" />
+        <where>
+            ce.is_delete = 0
+            AND ce.id = #{id}
+        </where>
     </select>
 
     <select id="costExternalList" resultMap="CostExternalVoMap">
         SELECT
-            contact_person,
-            contact_mobile,
-            GROUP_CONCAT(id) as ids
+        contact_person,
+        contact_mobile,
+        GROUP_CONCAT(id) as ids
         FROM
-            ptl_agreement_cost_external
+        ptl_agreement_cost_external
         <where>
             is_delete = 0
-        <if test="ptlAgreementId != null and ptlAgreementId != ''">
-            AND ptl_agreement_id = #{ptlAgreementId}
-        </if>
-            GROUP BY contact_person,contact_mobile
+            <if test="ptlAgreementId != null and ptlAgreementId != ''">
+                AND ptl_agreement_id = #{ptlAgreementId}
+            </if>
         </where>
+        GROUP BY contact_person,contact_mobile
     </select>
 
     <select id="selectByIds" resultMap="CostExternalListVoMap">
-        <include refid="Base_Column" /> WHERE ce.id in (${ids})
+        <include refid="Base_Column" />
+        <where>
+            ce.is_delete = 0
+            AND ce.id in (${ids})
+        </where>
     </select>
 
     <select id="selectCostExternalTypeVo" resultType="com.jzg.commons.entity.vo.CostExternalTypeVo">
-        <include refid="Base_Column_type" /> WHERE ptl_agreement_cost_external_id = #{id}
+        <include refid="Base_Column_type" />
+        <where>
+            is_delete = 0
+            AND ptl_agreement_cost_external_id = #{id}
+        </where>
     </select>
 
 
@@ -108,25 +120,25 @@
 
     <select id="pageList" resultMap="ExternalListVoMap">
         SELECT
-            ce.id,
-            ce.product_name,
-            ce.product_id,
-            ce.cost_describe,
-            ce.is_inquiry,
-            ce.effective_time,
-            ce.failure_time,
-            ce.audit_status,
-            ce.is_enabled,
-            ce.contact_person,
-            ce.contact_mobile,
-            ce.audit_method,
-            ce.create_time,
-            ce.create_by,
-            pa.agreement_code,
-            pa.agreement_abbreviation
+        ce.id,
+        ce.product_name,
+        ce.product_id,
+        ce.cost_describe,
+        ce.is_inquiry,
+        ce.effective_time,
+        ce.failure_time,
+        ce.audit_status,
+        ce.is_enabled,
+        ce.contact_person,
+        ce.contact_mobile,
+        ce.audit_method,
+        ce.create_time,
+        ce.create_by,
+        pa.agreement_code,
+        pa.agreement_abbreviation
         FROM
-            ptl_agreement_cost_external ce
-                LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id
+        ptl_agreement_cost_external ce
+        LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id AND pa.is_delete = 0
         <where>
             ce.is_delete = 0
             <if test="costParam.agreement != null and costParam.agreement != ''">

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -129,7 +129,7 @@
         <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
         <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
         <collection property="ruleConditions" column="{costId=costId}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
-     </resultMap>
+    </resultMap>
 
 
     <select id="queryByAgreementIdAndCoverRuleId" resultMap="CostListMap">
@@ -166,7 +166,7 @@
         r.batch as batch
         FROM
         ptl_agreement_cost c
-        left join ptl_agreement_cost_rule r on c.id = r.ptl_agreement_cost_id
+        left join ptl_agreement_cost_rule r on c.id = r.ptl_agreement_cost_id AND r.is_delete = 0
         <where>
             c.is_delete = 0
             AND
@@ -182,60 +182,63 @@
 
     <select id="selectCostById"  resultMap="CostResultMap">
         SELECT
-            t.id,
-            t.priority_level,
-            t.ptl_agreement_id,
-            t.product_name,
-            t.product_id,
-            t.effective_time,
-            t.failure_time,
-            t.audit_method,
-            t.cost_rules,
-            t.cost_describe,
-            t.approved,
-            t.is_valid,
-            t.is_enabled
+        t.id,
+        t.priority_level,
+        t.ptl_agreement_id,
+        t.product_name,
+        t.product_id,
+        t.effective_time,
+        t.failure_time,
+        t.audit_method,
+        t.cost_rules,
+        t.cost_describe,
+        t.approved,
+        t.is_valid,
+        t.is_enabled
         FROM
-            ptl_agreement_cost t
-        WHERE t.id IN (${costId})
+        ptl_agreement_cost t
+        <where>
+            t.is_delete = 0
+            AND t.id IN (${costId})
+        </where>
     </select>
 
 
     <select id="queryById" resultMap="BaseResultMap">
         SELECT
-            t.id,
-            t.ptl_agreement_id,
-            t.cover_rule_id,
-            t.product_name,
-            t.product_id,
-            t.effective_time,
-            t.failure_time,
-            t.audit_method,
-            t.cost_describe,
-            t.approved,
-            t.is_delete,
-            t.create_by,
-            t.create_time,
-            t.update_by,
-            t.update_time,
-            t.audit_person,
-            t.review_description,
-            t.audit_time,
-            t.priority_level,
-            pa.agreement_code,
-            pa.agreement_title,
-            pa.jq_entrance_fee_ratio,
-            pa.sy_entrance_fee_ratio,
-            pa.jy_entrance_fee_ratio
+        t.id,
+        t.ptl_agreement_id,
+        t.cover_rule_id,
+        t.product_name,
+        t.product_id,
+        t.effective_time,
+        t.failure_time,
+        t.audit_method,
+        t.cost_describe,
+        t.approved,
+        t.is_delete,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.audit_person,
+        t.review_description,
+        t.audit_time,
+        t.priority_level,
+        pa.agreement_code,
+        pa.agreement_title,
+        pa.jq_entrance_fee_ratio,
+        pa.sy_entrance_fee_ratio,
+        pa.jy_entrance_fee_ratio
         FROM
-            ptl_agreement_cost t
-            LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id
-           <where>
-               t.is_delete = 0
-               <if test="id != null">
-                   AND t.id = #{id}
-               </if>
-           </where>
+        ptl_agreement_cost t
+        LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id AND pa.is_delete = 0
+        <where>
+            t.is_delete = 0
+            <if test="id != null">
+                AND t.id = #{id}
+            </if>
+        </where>
     </select>
 
 
@@ -274,54 +277,62 @@
 
     <select id="selectCostRule" resultMap="costRule">
         SELECT
-            tr.id,
-            tr.ptl_agreement_cost_id,
-            tr.rules_id,
-            tr.attr_id,
-            tr.attr_code,
-            tr.min,
-            tr.max,
-            tr.operator,
-            tr.batch,
-            a.attr_name,
-            a.attr_type,
-            a.attr_group,
-            a.dict_id
+        tr.id,
+        tr.ptl_agreement_cost_id,
+        tr.rules_id,
+        tr.attr_id,
+        tr.attr_code,
+        tr.min,
+        tr.max,
+        tr.operator,
+        tr.batch,
+        a.attr_name,
+        a.attr_type,
+        a.attr_group,
+        a.dict_id
         FROM
-            ptl_agreement_cost_rule tr
-            left join ptl_agreement_undwrt_rules_attr a on tr.attr_code = a.attr_code
-        WHERE
-            tr.ptl_agreement_cost_id = #{costId}
+        ptl_agreement_cost_rule tr
+        left join ptl_agreement_undwrt_rules_attr a on tr.attr_code = a.attr_code AND a.is_delete = 0
+        <where>
+            tr.is_delete = 0
+            AND tr.ptl_agreement_cost_id = #{costId}
+        </where>
     </select>
 
     <select id="selectCostType" resultMap="costType">
         SELECT
-            tt.id,
-            tt.ptl_agreement_cost_id,
-            tt.cost_type,
-            tt.inlet,
-            tt.export,
-            tt.add_throw,
-            tt.keep_point_ratio,
-            tt.export_keep_point_ratio,
-            CASE
-                WHEN tt.cost_type = '交强险' THEN pa.jq_entrance_fee_ratio
-                WHEN tt.cost_type = '商业险' THEN pa.sy_entrance_fee_ratio
-                WHEN tt.cost_type = '驾意险' THEN pa.jy_entrance_fee_ratio
-                ELSE NULL
-                END AS commission
+        tt.id,
+        tt.ptl_agreement_cost_id,
+        tt.cost_type,
+        tt.inlet,
+        tt.export,
+        tt.add_throw,
+        tt.keep_point_ratio,
+        tt.export_keep_point_ratio,
+        CASE
+        WHEN tt.cost_type = '交强险' THEN pa.jq_entrance_fee_ratio
+        WHEN tt.cost_type = '商业险' THEN pa.sy_entrance_fee_ratio
+        WHEN tt.cost_type = '驾意险' THEN pa.jy_entrance_fee_ratio
+        ELSE NULL
+        END AS commission
         FROM
-            ptl_agreement_cost_type tt
-                left join ptl_agreement_cost pac on pac.id = tt.ptl_agreement_cost_id
-                left join ptl_agreement pa on pa.id = pac.ptl_agreement_id
-        WHERE
-            tt.ptl_agreement_cost_id = #{costId}
+        ptl_agreement_cost_type tt
+        left join ptl_agreement_cost pac on pac.id = tt.ptl_agreement_cost_id AND pac.is_delete = 0
+        left join ptl_agreement pa on pa.id = pac.ptl_agreement_id AND pa.is_delete = 0
+        <where>
+            tt.is_delete = 0
+            AND tt.ptl_agreement_cost_id = #{costId}
+        </where>
     </select>
 
 
     <select id="selectDictLabal" resultMap="RulesDictLabalMap">
         <if test="dictId != null and dictId != ''">
-            select * from  ptl_agreement_undwrt_rules_dict_labal where dict_id = #{dictId}
+            select * from  ptl_agreement_undwrt_rules_dict_labal
+            <where>
+                is_delete = 0
+                AND dict_id = #{dictId}
+            </where>
         </if>
     </select>
 
@@ -347,10 +358,10 @@
             pa.agreement_title,
             pa.agreement_abbreviation,
             pa.id as ptlAgreementId,
-            CASE 
-                WHEN pr_raw.parent_id IS NOT NULL AND pr_raw.parent_id != '' 
-                THEN (SELECT GROUP_CONCAT(child.rule_description ORDER BY child.order_num ASC SEPARATOR '，') 
-                      FROM ptl_agreement_undwrt_rules child 
+            CASE
+                WHEN pr_raw.parent_id IS NOT NULL AND pr_raw.parent_id != ''
+                THEN (SELECT GROUP_CONCAT(child.rule_description ORDER BY child.order_num ASC SEPARATOR '，')
+                      FROM ptl_agreement_undwrt_rules child
                       WHERE child.parent_id = pr_raw.parent_id AND child.is_delete = 0)
                 ELSE pr_raw.rule_description
             END AS rule_description,
@@ -367,24 +378,24 @@
             ptl_agreement_cost pc
                 LEFT JOIN ptl_agreement pa ON pa.id = pc.ptl_agreement_id and pa.is_delete = 0
                 LEFT JOIN ptl_agreement_undwrt_rules pr_raw ON pr_raw.id = pc.cover_rule_id AND pr_raw.is_delete = 0
-        LEFT JOIN esm_ins_company eic on eic.id = pa.company_id
+        LEFT JOIN esm_ins_company eic on eic.id = pa.company_id  AND eic.is_delete = 0
         <where>
             pc.is_delete = 0
             <if test="costParam.agreement != null and costParam.agreement != ''">
                 AND (pa.agreement_title  like concat('%',#{costParam.agreement},'%') or
-                     pa.agreement_code  like concat('%',#{costParam.agreement},'%') or
-                     pa.agreement_abbreviation  like concat('%',#{costParam.agreement},'%') or
-                     pa.id = #{costParam.agreement})
+                pa.agreement_code  like concat('%',#{costParam.agreement},'%') or
+                pa.agreement_abbreviation  like concat('%',#{costParam.agreement},'%') or
+                pa.id = #{costParam.agreement})
             </if>
             <if test="costParam.productId != null and costParam.productId != ''">
                 AND pc.product_id = #{costParam.productId}
             </if>
             <if test="costParam.rulesName != null and costParam.rulesName != ''">
                 AND (
-                    (pr_raw.parent_id IS NOT NULL AND pr_raw.parent_id != '' 
-                     AND EXISTS (SELECT 1 FROM ptl_agreement_undwrt_rules child 
-                                 WHERE child.parent_id = pr_raw.parent_id 
-                                   AND child.is_delete = 0 
+                    (pr_raw.parent_id IS NOT NULL AND pr_raw.parent_id != ''
+                     AND EXISTS (SELECT 1 FROM ptl_agreement_undwrt_rules child
+                                 WHERE child.parent_id = pr_raw.parent_id
+                                   AND child.is_delete = 0
                                    AND child.rule_description LIKE concat('%',#{costParam.rulesName},'%')))
                     OR (pr_raw.parent_id IS NULL OR pr_raw.parent_id = '')
                     AND pr_raw.rule_description LIKE concat('%',#{costParam.rulesName},'%')
@@ -439,35 +450,4 @@
         order by pc.create_time desc
     </select>
 
-<!--    <select id="selectById" resultMap="BaseResultMap">-->
-<!--        SELECT-->
-<!--        t.id,-->
-<!--        t.ptl_agreement_id,-->
-<!--        t.product_name,-->
-<!--        t.product_id,-->
-<!--        t.effective_time,-->
-<!--        t.failure_time,-->
-<!--        t.audit_method,-->
-<!--        t.cost_describe,-->
-<!--        t.is_delete,-->
-<!--        t.create_by,-->
-<!--        t.create_time,-->
-<!--        t.update_by,-->
-<!--        t.update_time,-->
-<!--        t.audit_person,-->
-<!--        t.review_description,-->
-<!--        t.audit_time,-->
-<!--        pa.agreement_code,-->
-<!--        pa.agreement_title-->
-<!--        FROM-->
-<!--        ptl_agreement_cost t-->
-<!--        LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id-->
-<!--        <where>-->
-<!--            t.is_delete = 0-->
-<!--            <if test="id != null">-->
-<!--                AND t.id = #{id}-->
-<!--            </if>-->
-<!--        </where>-->
-<!--    </select>-->
-
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementCostTypeMapper.xml

@@ -8,10 +8,10 @@
     </resultMap>
     <select id="queryByCostId" resultMap="ResultMap">
         select *
-            from
-        ptl_agreement_cost_type
-        where 1=1
-            and ptl_agreement_cost_type.is_delete = 0
+        from ptl_agreement_cost_type
+        <where>
+            and is_delete = 0
             and ptl_agreement_cost_id = #{costId}
+        </where>
     </select>
 </mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementDispatchActionMapper.xml

@@ -14,12 +14,14 @@
 
     <select id="getActions" resultMap="ActionMap">
         select *
-        from
-            ptl_agreement_dispatch_action
-        where 1=1
-          and dispatch_id in
-        <foreach collection="dispatchIds" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        from ptl_agreement_dispatch_action
+        <where>
+            is_delete = 0
+            and dispatch_id in
+            <foreach collection="dispatchIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </where>
     </select>
-</mapper>
+
+</mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementDispatchAfterActionMapper.xml

@@ -14,9 +14,11 @@
 
     <select id="getAfterActions" resultMap="ActionMap">
         select *
-        from
-            ptl_agreement_dispatch_after_action
-        where 1=1
-          and company_id = #{id}
+        from ptl_agreement_dispatch_after_action
+        <where>
+            is_delete = 0
+            and company_id = #{id}
+        </where>
     </select>
-</mapper>
+
+</mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementMapper.xml

@@ -5,42 +5,42 @@
 <mapper namespace="com.jzg.organization.mapper.PtlAgreementMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.PtlAgreement">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="agreementType" column="agreement_type" jdbcType="TINYINT"/>
-            <result property="agreementCode" column="agreement_code" jdbcType="VARCHAR"/>
-            <result property="agreementName" column="agreement_name" jdbcType="VARCHAR"/>
-            <result property="agreementTitle" column="agreement_title" jdbcType="VARCHAR"/>
-            <result property="agreementAbbreviation" column="agreement_abbreviation" jdbcType="VARCHAR"/>
-            <result property="isEnable" column="is_enable" jdbcType="TINYINT"/>
-            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-            <result property="partnerCompanyId" column="partner_company_id" jdbcType="VARCHAR"/>
-            <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
-            <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
-            <result property="moneyTime" column="money_time" jdbcType="INTEGER"/>
-            <result property="matchType" column="match_type" jdbcType="VARCHAR"/>
-            <result property="dockingPerson" column="docking_person" jdbcType="VARCHAR"/>
-            <result property="dockingPhone" column="docking_phone" jdbcType="VARCHAR"/>
-            <result property="validStatus" column="valid_status" jdbcType="VARCHAR"/>
-            <result property="moneyType" column="money_type" jdbcType="TINYINT"/>
-            <result property="fileId" column="file_id" jdbcType="VARCHAR"/>
-            <result property="auditContent" column="audit_content" jdbcType="VARCHAR"/>
-            <result property="auditStatus" column="audit_status" jdbcType="TINYINT"/>
-            <result property="serialNumber" column="serial_number" jdbcType="INTEGER"/>
-            <result property="withTax" column="with_tax" jdbcType="TINYINT"/>
-            <result property="auditType" column="audit_type" jdbcType="TINYINT"/>
-            <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
-            <result property="isExternal" column="is_external" jdbcType="TINYINT"/>
-            <result property="custodianId" column="custodian_id" jdbcType="VARCHAR"/>
-            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
-            <result property="attributionId" column="attribution_id" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
-            <result property="jqEntranceFeeRatio" column="jq_entrance_fee_ratio" jdbcType="VARCHAR"/>
-            <result property="syEntranceFeeRatio" column="sy_entrance_fee_ratio" jdbcType="VARCHAR"/>
-            <result property="jyEntranceFeeRatio" column="jy_entrance_fee_ratio" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="agreementType" column="agreement_type" jdbcType="TINYINT"/>
+        <result property="agreementCode" column="agreement_code" jdbcType="VARCHAR"/>
+        <result property="agreementName" column="agreement_name" jdbcType="VARCHAR"/>
+        <result property="agreementTitle" column="agreement_title" jdbcType="VARCHAR"/>
+        <result property="agreementAbbreviation" column="agreement_abbreviation" jdbcType="VARCHAR"/>
+        <result property="isEnable" column="is_enable" jdbcType="TINYINT"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="partnerCompanyId" column="partner_company_id" jdbcType="VARCHAR"/>
+        <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
+        <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
+        <result property="moneyTime" column="money_time" jdbcType="INTEGER"/>
+        <result property="matchType" column="match_type" jdbcType="VARCHAR"/>
+        <result property="dockingPerson" column="docking_person" jdbcType="VARCHAR"/>
+        <result property="dockingPhone" column="docking_phone" jdbcType="VARCHAR"/>
+        <result property="validStatus" column="valid_status" jdbcType="VARCHAR"/>
+        <result property="moneyType" column="money_type" jdbcType="TINYINT"/>
+        <result property="fileId" column="file_id" jdbcType="VARCHAR"/>
+        <result property="auditContent" column="audit_content" jdbcType="VARCHAR"/>
+        <result property="auditStatus" column="audit_status" jdbcType="TINYINT"/>
+        <result property="serialNumber" column="serial_number" jdbcType="INTEGER"/>
+        <result property="withTax" column="with_tax" jdbcType="TINYINT"/>
+        <result property="auditType" column="audit_type" jdbcType="TINYINT"/>
+        <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
+        <result property="isExternal" column="is_external" jdbcType="TINYINT"/>
+        <result property="custodianId" column="custodian_id" jdbcType="VARCHAR"/>
+        <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
+        <result property="attributionId" column="attribution_id" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <result property="jqEntranceFeeRatio" column="jq_entrance_fee_ratio" jdbcType="VARCHAR"/>
+        <result property="syEntranceFeeRatio" column="sy_entrance_fee_ratio" jdbcType="VARCHAR"/>
+        <result property="jyEntranceFeeRatio" column="jy_entrance_fee_ratio" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -64,13 +64,13 @@
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AgreementVo">
         select <include refid="Base_Column_List"/>
         FROM ptl_agreement pa
-        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id
-        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id
-        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id
-        LEFT JOIN sys_dept sd on suji.dept_id = sd.id
-        LEFT JOIN sys_upload_files suf on pa.file_id = suf.id
-        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
-        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
+        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id AND paa.is_delete = 0
+        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id AND sdd.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_dept sd on suji.dept_id = sd.id AND sd.is_delete = 0
+        LEFT JOIN sys_upload_files suf on pa.file_id = suf.id AND suf.is_delete = 0
+        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id AND eic.is_delete = 0
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id AND eica.is_delete = 0
         <where>
             pa.is_delete = 0
             <if test="param.searchValue != null and param.searchValue != ''">
@@ -81,16 +81,18 @@
             </if>
             <if test="param.companyId != null and param.companyId != ''">
                 and pa.company_id in (
-                    WITH RECURSIVE t AS (
-                    SELECT id
-                    FROM esm_ins_company
-                    WHERE id = #{param.companyId}
-                    AND parent_id = 0
-                    UNION ALL
-                    SELECT c.id
-                    FROM esm_ins_company c
-                    JOIN t ON c.parent_id = t.id
-                    )
+                WITH RECURSIVE t AS (
+                SELECT id
+                FROM esm_ins_company
+                WHERE id = #{param.companyId}
+                AND parent_id = 0
+                AND is_delete = 0
+                UNION ALL
+                SELECT c.id
+                FROM esm_ins_company c
+                JOIN t ON c.parent_id = t.id
+                WHERE c.is_delete = 0
+                )
                 SELECT id FROM t)
             </if>
             <if test="param.companyIds != null and param.companyIds != ''">
@@ -134,13 +136,13 @@
     <select id="queryList" resultType="com.jzg.commons.entity.vo.AgreementVo">
         select <include refid="Base_Column_List"/>
         FROM ptl_agreement pa
-        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id
-        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id
-        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id
-        LEFT JOIN sys_dept sd on suji.dept_id = sd.id
-        LEFT JOIN sys_upload_files suf on pa.file_id = suf.id
-        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
-        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
+        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id AND paa.is_delete = 0
+        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id AND sdd.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_dept sd on suji.dept_id = sd.id AND sd.is_delete = 0
+        LEFT JOIN sys_upload_files suf on pa.file_id = suf.id AND suf.is_delete = 0
+        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id AND eic.is_delete = 0
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id AND eica.is_delete = 0
         <where>
             pa.is_delete = 0
             <if test="param.searchValue != null and param.searchValue != ''">
@@ -189,14 +191,15 @@
     <select id="queryById" resultType="com.jzg.commons.entity.vo.AgreementVo">
         select <include refid="Base_Column_List"/>
         FROM ptl_agreement pa
-        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id
-        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id
-        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id
-        LEFT JOIN sys_dept sd on suji.dept_id = sd.id
---         LEFT JOIN sys_upload_files suf on suf.id = pa.file_id
-        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
-        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
+        LEFT JOIN ptl_agreement_attribution paa on pa.attribution_id = paa.id AND paa.is_delete = 0
+        LEFT JOIN sys_dept sdd on pa.dept_id = sdd.id AND sdd.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji on pa.custodian_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_dept sd on suji.dept_id = sd.id AND sd.is_delete = 0
+        --         LEFT JOIN sys_upload_files suf on suf.id = pa.file_id
+        LEFT JOIN esm_ins_company eic on pa.company_id = eic.id AND eic.is_delete = 0
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id AND eica.is_delete = 0
         <where>
+            pa.is_delete = 0
             <if test="id != null and id != ''">
                 and pa.id = #{id}
             </if>
@@ -205,22 +208,25 @@
 
     <select id="getByCompanyId" resultType="com.jzg.commons.entity.po.PtlAgreement">
         select
-            *
+        *
         FROM
-            ptl_agreement
-        where
+        ptl_agreement
+        <where>
             is_delete = 0
-          and company_id in (
+            and company_id in (
             WITH RECURSIVE t AS (
-                SELECT id
-                FROM esm_ins_company
-                WHERE id = #{companyId}
-                  AND parent_id = 0
-                UNION ALL
-                SELECT c.id
-                FROM esm_ins_company c
-                         JOIN t ON c.parent_id = t.id
+            SELECT id
+            FROM esm_ins_company
+            WHERE id = #{companyId}
+            AND parent_id = 0
+            AND is_delete = 0
+            UNION ALL
+            SELECT c.id
+            FROM esm_ins_company c
+            JOIN t ON c.parent_id = t.id
+            WHERE c.is_delete = 0
             )
             SELECT id FROM t)
+        </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementUndwrtRulesAttrLinkMapper.xml

@@ -5,18 +5,18 @@
 <mapper namespace="com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrLinkMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="rulesId" column="rules_id" jdbcType="VARCHAR"/>
-            <result property="attrId" column="attr_id" jdbcType="VARCHAR"/>
-            <result property="attrCode" column="attr_code" jdbcType="VARCHAR"/>
-            <result property="min" column="min" jdbcType="VARCHAR"/>
-            <result property="operator" column="operator" jdbcType="VARCHAR"/>
-            <result property="max" column="max" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="rulesId" column="rules_id" jdbcType="VARCHAR"/>
+        <result property="attrId" column="attr_id" jdbcType="VARCHAR"/>
+        <result property="attrCode" column="attr_code" jdbcType="VARCHAR"/>
+        <result property="min" column="min" jdbcType="VARCHAR"/>
+        <result property="operator" column="operator" jdbcType="VARCHAR"/>
+        <result property="max" column="max" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -29,7 +29,7 @@
     <select id="queryLinkList" resultType="com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink">
         SELECT <include refid="Base_Column_List"/>
         FROM ptl_agreement_undwrt_rules_attr_link pl
-        LEFT JOIN ptl_agreement_undwrt_rules_attr pa on pl.attr_code = pa.attr_code
+        LEFT JOIN ptl_agreement_undwrt_rules_attr pa on pl.attr_code = pa.attr_code AND pa.is_delete = 0
         <where>
             pl.is_delete = 0
             <if test="ruleId != null and ruleId != ''">
@@ -37,4 +37,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/PtlSchemeInsuranceDrivingIntentionMapper.xml

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.organization.mapper.PtlSchemeInsuranceDrivingIntentionMapper">
 
-
-
     <select id="getSchemeDrivingIntention" resultType="com.jzg.commons.entity.scheme.po.PtlSchemeInsuranceDrivingIntention">
         SELECT
         psidi.id,
@@ -14,11 +12,13 @@
         psidi.driving_intention_id
         FROM
         ptl_scheme_insurance_driving_intention psidi
-        LEFT JOIN jyx_config jc ON psidi.driving_intention_id = jc.id
-        WHERE
-        1=1
-        <if test="schemeId != null and schemeId != ''">
-            AND psidi.scheme_info_id = #{schemeId}
-        </if>
+        LEFT JOIN jyx_config jc ON psidi.driving_intention_id = jc.id AND jc.is_delete = 0
+        <where>
+            psidi.is_delete = 0
+            <if test="schemeId != null and schemeId != ''">
+                AND psidi.scheme_info_id = #{schemeId}
+            </if>
+        </where>
     </select>
-</mapper>
+
+</mapper>

tenant/organization/src/main/resources/mapper/PtlSchemeInsuranceMapper.xml

@@ -12,7 +12,6 @@
         </collection>
     </resultMap>
 
-
     <select id="getSchemeInsurance" resultMap="SchemeResultVoMap">
         SELECT
         psi.id,
@@ -23,12 +22,13 @@
         ibio.label as option_name
         FROM
         ptl_scheme_insurance psi
-        LEFT JOIN ins_business_insurance ibi ON psi.insurance_id = ibi.id
-        LEFT JOIN ins_business_insurance_option ibio ON ibio.id = psi.option_id
-        WHERE
-        1=1
-        <if test="schemeId != null and schemeId != ''">
-            AND psi.scheme_info_id = #{schemeId}
-        </if>
+        LEFT JOIN ins_business_insurance ibi ON psi.insurance_id = ibi.id AND ibi.is_delete = 0
+        LEFT JOIN ins_business_insurance_option ibio ON ibio.id = psi.option_id AND ibio.is_delete = 0
+        <where>
+            psi.is_delete = 0
+            <if test="schemeId != null and schemeId != ''">
+                AND psi.scheme_info_id = #{schemeId}
+            </if>
+        </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/PtlSchemeMapper.xml

@@ -52,23 +52,22 @@
 
     <select id="getSchemePage" resultType="com.jzg.commons.entity.scheme.vo.PtlSchemeVo">
         SELECT
-            psi.id,
-            psi.scheme_name,
-            psi.description,
-            psi.scheme_type,
-            ps.rule_desc,
-            ps.id AS scheme_id,
-            ps.company_id,
-            ps.product_id,
-            ps.product_name,
-            count( psidi.id ) AS driving_intention_num
+        psi.id,
+        psi.scheme_name,
+        psi.description,
+        psi.scheme_type,
+        ps.rule_desc,
+        ps.id AS scheme_id,
+        ps.company_id,
+        ps.product_id,
+        ps.product_name,
+        count( psidi.id ) AS driving_intention_num
         FROM
-            ptl_scheme_info psi
-                INNER JOIN ptl_scheme ps ON ps.id = psi.scheme_id
-                LEFT JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id
+        ptl_scheme_info psi
+        INNER JOIN ptl_scheme ps ON ps.id = psi.scheme_id AND ps.is_delete = 0
+        LEFT JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id AND psidi.is_delete = 0
         WHERE
-        1=1
-          AND psi.is_delete = 0
+         psi.is_delete = 0
         <if test="param.ruleDesc != null and param.ruleDesc != ''">
             AND ps.rule_desc LIKE CONCAT('%', #{param.ruleDesc}, '%')
         </if>
@@ -82,7 +81,7 @@
             AND ps.company_id = #{param.companyId}
         </if>
         GROUP BY
-            psi.id
+        psi.id
     </select>
 
     <select id="getCompanyList" resultType="com.jzg.commons.entity.po.EsmInsCompany">
@@ -101,12 +100,12 @@
             suf.file_name as logo
         FROM
             esm_ins_company eic
-                left join sys_upload_files suf on eic.logo = suf.id
-                left join ptl_scheme ps on eic.id = ps.company_id
-                left join ptl_scheme_info psi on ps.id = psi.scheme_id
+            left join sys_upload_files suf on eic.logo = suf.id AND suf.is_delete = 0
+            left join ptl_scheme ps on eic.id = ps.company_id AND ps.is_delete = 0
+            left join ptl_scheme_info psi on ps.id = psi.scheme_id AND psi.is_delete = 0
         WHERE
             eic.parent_id = 0
-        AND
+          AND
             eic.is_delete = 0
         group by eic.id
         order by count desc
@@ -132,14 +131,14 @@
             ibio.`value`
         FROM
             ptl_scheme ps
-            LEFT JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id
-            left join ptl_scheme_insurance psis on psi.id = psis.scheme_info_id
-            left join ins_business_insurance ibi on psis.insurance_id = ibi.id
-            left join ins_business_insurance_option ibio on psis.option_id = ibio.id
+                LEFT JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id AND psi.is_delete = 0
+                left join ptl_scheme_insurance psis on psi.id = psis.scheme_info_id AND psis.is_delete = 0
+                left join ins_business_insurance ibi on psis.insurance_id = ibi.id AND ibi.is_delete = 0
+                left join ins_business_insurance_option ibio on psis.option_id = ibio.id AND ibio.is_delete = 0
         WHERE
             ps.company_id = #{companyId}
-            AND ps.product_id = #{productId}
-            AND psi.is_delete = 0
+          AND ps.product_id = #{productId}
+          AND ps.is_delete = 0
         order by ibi.id,ibio.sort asc
 
     </select>
@@ -164,12 +163,14 @@
             psidi.selected_status
         FROM
             ptl_scheme ps
-                left JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id
-                left JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id
-                left JOIN jyx_config jc ON psidi.driving_intention_id = jc.id
-                left JOIN jyx_config jc1 on jc.parent_id = jc1.id
-        WHERE  ps.company_id = #{companyId}
-        AND ps.product_id = #{productId}
-        and psidi.id is not null
+                left JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id AND psi.is_delete = 0
+                left JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id AND psidi.is_delete = 0
+                left JOIN jyx_config jc ON psidi.driving_intention_id = jc.id AND jc.is_delete = 0
+                left JOIN jyx_config jc1 on jc.parent_id = jc1.id AND jc1.is_delete = 0
+        WHERE
+            ps.company_id = #{companyId}
+          AND ps.product_id = #{productId}
+          AND ps.is_delete = 0
+          and psidi.id is not null
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysActivityMapper.xml

@@ -3,35 +3,35 @@
 <mapper namespace="com.jzg.organization.mapper.SysActivityMapper">
     <select id="getSysActivityList" resultType="com.jzg.commons.entity.po.SysActivity">
         select DISTINCT
-            sa.id as id,
-            sa.act_dept as actDept,
-            sa.act_name as actName,
-            sd.name as actDeptName,
-            sa.act_method as actMethod,
-            sa.act_start_time as actStartTime,
-            sa.act_end_time as actEndTime,
-            sa.create_time as createTime,
-            sa.create_by as createBy,
-            sa.act_status as actStatus,
-            sa.is_delete as isDelete,
-            sa.is_end as isEnd
+        sa.id as id,
+        sa.act_dept as actDept,
+        sa.act_name as actName,
+        sd.name as actDeptName,
+        sa.act_method as actMethod,
+        sa.act_start_time as actStartTime,
+        sa.act_end_time as actEndTime,
+        sa.create_time as createTime,
+        sa.create_by as createBy,
+        sa.act_status as actStatus,
+        sa.is_delete as isDelete,
+        sa.is_end as isEnd
         from
-            sys_activity sa
+        sys_activity sa
         left join sys_dept sd on sa.act_dept = sd.id
         left join sys_activity_dept sad ON sa.id = sad.activity_id
         left join sys_dept sd2 ON sad.dept_id = sd2.id
-        where
-            1=1
-          and sa.is_delete = '0'
-          and sd.system_code = #{sysActivityVo.systemCode}
-        <if test="sysActivityVo.actName != null and sysActivityVo.actName != ''">
-            and sa.act_name like concat('%',#{sysActivityVo.actName},'%')
-        </if>
-        <if test="sysActivityVo.actStatus != null and sysActivityVo.actStatus != ''">
-            and sa.act_status = #{sysActivityVo.actStatus}
-            <if test="sysActivityVo.actStatus == '3'">
-                and sa.is_end = 1
+        <where>
+            sa.is_delete = 0
+            and sd.system_code = #{sysActivityVo.systemCode}
+            <if test="sysActivityVo.actName != null and sysActivityVo.actName != ''">
+                and sa.act_name like concat('%',#{sysActivityVo.actName},'%')
             </if>
-        </if>
+            <if test="sysActivityVo.actStatus != null and sysActivityVo.actStatus != ''">
+                and sa.act_status = #{sysActivityVo.actStatus}
+                <if test="sysActivityVo.actStatus == '3'">
+                    and sa.is_end = 1
+                </if>
+            </if>
+        </where>
     </select>
 </mapper>

tenant/organization/src/main/resources/mapper/SysActivityRecordMapper.xml

@@ -4,36 +4,46 @@
 
     <select id="getActivityRecord" resultType="com.jzg.commons.entity.dto.SysActivityRecordDto">
         select
-            sar.id,
-            suji.name as name,
-            su.mobile as mobile,
-            suji.dept_id as deptId,
-            sd.name as deptName,
-            sar.create_time as createTime,
-            saa.award_name as awardName,
-            saa.award_type as awardType
+        sar.id,
+        suji.name as name,
+        su.mobile as mobile,
+        suji.dept_id as deptId,
+        sd.name as deptName,
+        sar.create_time as createTime,
+        saa.award_name as awardName,
+        saa.award_type as awardType
         from sys_activity_record sar
         left join sys_activity sa on sa.id = sar.activity_id
         left join sys_user_jzg_info suji on suji.id = sar.user_jzg_info_id
         left join sys_activity_award saa on saa.id = sar.award_id
         left join sys_dept sd on sd.id = suji.dept_id
         left join sys_user su on su.id = suji.user_id
-        where
-            1=1
-        <if test="sysActivityRecordVo.salesman != null and sysActivityRecordVo.salesman != ''">
-            and suji.name = #{sysActivityRecordVo.salesman}
-            or su.mobile = #{sysActivityRecordVo.salesman}
-            or suji.work_number = #{sysActivityRecordVo.salesman}
-        </if>
-        <if test="sysActivityRecordVo.createTimeStart != null and sysActivityRecordVo.createTimeEnd != null">
-            and DATE_FORMAT(sar.create_time, '%Y-%m-%d') between #{sysActivityRecordVo.createTimeStart} AND #{sysActivityRecordVo.createTimeEnd}
-        </if>
-        <if test="sysActivityRecordVo.awardType != null and sysActivityRecordVo.awardType != ''">
-            and saa.award_type = #{sysActivityRecordVo.awardType}
-        </if>
-        <if test="sysActivityRecordVo.awardName != null and sysActivityRecordVo.awardName != ''">
-            and saa.award_name like concat('%',#{sysActivityRecordVo.awardName},'%')
-        </if>
+        <where>
+            sar.is_delete = 0
+            and sa.is_delete = 0
+            and suji.is_delete = 0
+            and saa.is_delete = 0
+            and sd.is_delete = 0
+            and su.is_delete = 0
+
+            <if test="sysActivityRecordVo.salesman != null and sysActivityRecordVo.salesman != ''">
+                and (suji.name = #{sysActivityRecordVo.salesman}
+                or su.mobile = #{sysActivityRecordVo.salesman}
+                or suji.work_number = #{sysActivityRecordVo.salesman})
+            </if>
+
+            <if test="sysActivityRecordVo.createTimeStart != null and sysActivityRecordVo.createTimeEnd != null">
+                and DATE_FORMAT(sar.create_time, '%Y-%m-%d') between #{sysActivityRecordVo.createTimeStart} AND #{sysActivityRecordVo.createTimeEnd}
+            </if>
+
+            <if test="sysActivityRecordVo.awardType != null and sysActivityRecordVo.awardType != ''">
+                and saa.award_type = #{sysActivityRecordVo.awardType}
+            </if>
+
+            <if test="sysActivityRecordVo.awardName != null and sysActivityRecordVo.awardName != ''">
+                and saa.award_name like concat('%',#{sysActivityRecordVo.awardName},'%')
+            </if>
+        </where>
     </select>
 
 
@@ -59,15 +69,22 @@
         left join sys_activity_award saa on saa.id = sar.award_id
         left join sys_dept sd on sd.id = suji.dept_id
         left join sys_user su on su.id = suji.user_id
-        where
-        1=1
-        <if test="list != null and list.size() > 0">
-            and sar.id in
-            <foreach item="item" index="index" collection="list"
-                     open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+        <where>
+            sar.is_delete = 0
+            and sa.is_delete = 0
+            and suji.is_delete = 0
+            and saa.is_delete = 0
+            and sd.is_delete = 0
+            and su.is_delete = 0
+
+            <if test="list != null and list.size() > 0">
+                and sar.id in
+                <foreach item="item" index="index" collection="list"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
     </select>
 
 </mapper>

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -5,29 +5,29 @@
 <mapper namespace="com.jzg.organization.mapper.SysAmountAuditingMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysAmountAuditing">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="amount" column="amount" jdbcType="DECIMAL"/>
-            <result property="balanceAmount" column="balance_amount" jdbcType="DECIMAL"/>
-            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
-            <result property="auditingStatus" column="auditing_status" jdbcType="VARCHAR"/>
-            <result property="auditingTime" column="auditing_time" jdbcType="TIMESTAMP"/>
-            <result property="auditingUserId" column="auditing_user_id" jdbcType="VARCHAR"/>
-            <result property="voucherId" column="voucher_id" jdbcType="VARCHAR"/>
-            <result property="picId" column="pic_id" jdbcType="VARCHAR"/>
-            <result property="rejectReason" column="reject_reason" jdbcType="VARCHAR"/>
-            <result property="accountName" column="account_name" jdbcType="VARCHAR"/>
-            <result property="bankCardNum" column="bank_card_num" jdbcType="VARCHAR"/>
-            <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
-            <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
-            <result property="accountId" column="account_id" jdbcType="VARCHAR"/>
-            <result property="receiveTime" column="receive_time" jdbcType="TIMESTAMP"/>
-            <result property="receiveUser" column="receive_user" jdbcType="VARCHAR"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="amount" column="amount" jdbcType="DECIMAL"/>
+        <result property="balanceAmount" column="balance_amount" jdbcType="DECIMAL"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="auditingStatus" column="auditing_status" jdbcType="VARCHAR"/>
+        <result property="auditingTime" column="auditing_time" jdbcType="TIMESTAMP"/>
+        <result property="auditingUserId" column="auditing_user_id" jdbcType="VARCHAR"/>
+        <result property="voucherId" column="voucher_id" jdbcType="VARCHAR"/>
+        <result property="picId" column="pic_id" jdbcType="VARCHAR"/>
+        <result property="rejectReason" column="reject_reason" jdbcType="VARCHAR"/>
+        <result property="accountName" column="account_name" jdbcType="VARCHAR"/>
+        <result property="bankCardNum" column="bank_card_num" jdbcType="VARCHAR"/>
+        <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
+        <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
+        <result property="accountId" column="account_id" jdbcType="VARCHAR"/>
+        <result property="receiveTime" column="receive_time" jdbcType="TIMESTAMP"/>
+        <result property="receiveUser" column="receive_user" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -40,6 +40,7 @@
         is_delete,create_time,create_by,
         update_time,update_by,system_code
     </sql>
+
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
@@ -48,13 +49,14 @@
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId,
         saa.payment_time as paymentTime, saa.reject_reason as rejectReason, saa.reject_time as rejectTime, saa.reject_person as rejectPerson
         FROM sys_amount_auditing saa
-        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
-        LEFT JOIN sys_user su on su.id = saa.user_id
-        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
-        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
-        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
-        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = saa.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id AND sujim.is_delete = 0
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id AND sum.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id AND sujia.is_delete = 0
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id AND sua.is_delete = 0
         <where>
+            saa.is_delete = 0
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
             </if>
@@ -89,6 +91,7 @@
         </where>
         ORDER BY saa.create_time desc
     </select>
+
     <select id="queryList" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
@@ -97,13 +100,14 @@
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId,
         saa.payment_time as paymentTime
         FROM sys_amount_auditing saa
-        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
-        LEFT JOIN sys_user su on su.id = saa.user_id
-        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
-        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
-        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
-        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = saa.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id AND sujim.is_delete = 0
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id AND sum.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id AND sujia.is_delete = 0
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id AND sua.is_delete = 0
         <where>
+            saa.is_delete = 0
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
             </if>
@@ -139,7 +143,6 @@
         ORDER BY saa.create_time desc
     </select>
 
-
     <select id="queryPaymentPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
         saa.id,
@@ -161,15 +164,15 @@
         saa.bank_num AS bankNum,
         saa.auditing_time
         FROM sys_amount_auditing saa
-        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
-        LEFT JOIN sys_user su on su.id = saa.user_id
-        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
-        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
-        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
-        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
-        where
-            1=1
-        and saa.receive_user = #{userName}
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = saa.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id AND sujim.is_delete = 0
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id AND sum.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id AND sujia.is_delete = 0
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id AND sua.is_delete = 0
+        <where>
+            saa.is_delete = 0
+            and saa.receive_user = #{userName}
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username like concat('%', #{param.salesman}, '%') or su.mobile like concat('%', #{param.salesman}, '%'))
             </if>
@@ -190,6 +193,7 @@
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}
             </if>
+        </where>
         ORDER BY saa.create_time desc
     </select>
 
@@ -200,15 +204,15 @@
         saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum
         FROM sys_amount_auditing saa
-        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
-        LEFT JOIN sys_user su on su.id = saa.user_id
-        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
-        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
-        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
-        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
-        where
-            1=1
-        and saa.receive_user = #{userName}
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = saa.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id AND sujim.is_delete = 0
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id AND sum.is_delete = 0
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id AND sujia.is_delete = 0
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id AND sua.is_delete = 0
+        <where>
+            saa.is_delete = 0
+            and saa.receive_user = #{userName}
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username like concat('%', #{param.salesman}, '%') or su.mobile like concat('%', #{param.salesman}, '%'))
             </if>
@@ -229,12 +233,15 @@
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}
             </if>
+        </where>
         ORDER BY saa.create_time desc
     </select>
+
     <select id="queryPaymentByUserId" resultType="com.jzg.commons.entity.po.SysAmountAuditing">
         SELECT saa.*
         FROM sys_amount_auditing saa
         <where>
+            saa.is_delete = 0
             <if test="userId != null and userId != ''">
                 and saa.user_id  = #{userId}
             </if>
@@ -243,4 +250,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysDeptMapper.xml

@@ -1,13 +1,17 @@
 <?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.jzg.organization.mapper.SysDeptMapper">
+
     <select id="getMaxId" resultType="java.lang.String">
         SELECT IFNULL(MAX(id), 0) maxid
         FROM `sys_dept`
-        WHERE parent_id = #{deptId}
-        <if test='comLevel != null and comLevel != ""'>
-            and comlevel = #{comlevel}
-        </if>
+        <where>
+            is_delete = 0
+            and parent_id = #{deptId}
+            <if test='comLevel != null and comLevel != ""'>
+                and comlevel = #{comLevel}
+            </if>
+        </where>
     </select>
 
     <select id="selectDeptList" resultType="com.jzg.commons.entity.po.SysDept">
@@ -21,82 +25,48 @@
         from sys_dept ${ew.getCustomSqlSegment}
     </select>
 
-<!--    <select id="selectDeptVoList" resultType="com.jzg.commons.entity.po.SysDept">-->
-<!--        SELECT-->
-<!--        sd.*,-->
-<!--        COALESCE(COUNT(suji.user_id), 0) AS user_count-->
-<!--        FROM-->
-<!--        sys_dept sd-->
-<!--        LEFT JOIN-->
-<!--        sys_user_jzg_info suji ON suji.dept_id = sd.id-->
-<!--        where-->
-<!--        1=1-->
-<!--        AND-->
-<!--        sd.is_delete = 0-->
-<!--        <if test="deptId!=null and deptId!=''">-->
-
-<!--            and route like CONCAT('%',#{deptId}, '%')-->
-<!--        </if>-->
-<!--        <if test="name!=null and name!=''">-->
-<!--            and sd.name like CONCAT('%',#{name}, '%')-->
-<!--        </if>-->
-
-<!--        GROUP BY-->
-<!--        sd.id-->
-<!--        ORDER BY-->
-<!--        user_count DESC;-->
-<!--    </select>-->
-
     <select id="selectDeptVoList" resultType="com.jzg.commons.entity.po.SysDept">
         WITH RECURSIVE dept_tree AS (
         SELECT
         id,
         parent_id
-        FROM
-        sys_dept
-        WHERE
-            1=1
-        <if test="deptId!=null and deptId!=''">
-            and id = #{deptId}
-        </if>
-        <if test="name!=null and name!=''">
-            and name like CONCAT('%',#{name}, '%')
-        </if>
+        FROM sys_dept
+        <where>
+            is_delete = 0
+            <if test="deptId!=null and deptId!=''">
+                and id = #{deptId}
+            </if>
+            <if test="name!=null and name!=''">
+                and name like CONCAT('%',#{name}, '%')
+            </if>
+        </where>
         UNION ALL
         SELECT
         sd.id,
         sd.parent_id
-        FROM
-        sys_dept sd
-        JOIN dept_tree dt ON sd.parent_id = dt.id
+        FROM sys_dept sd
+        JOIN dept_tree dt ON sd.parent_id = dt.id AND sd.is_delete = 0
         ),
         dept_path AS (
         SELECT
         id AS child_id,
         id AS root_id
-        FROM
-        dept_tree
+        FROM dept_tree
         UNION ALL
         SELECT
         dt.id AS child_id,
         dp.root_id
-        FROM
-        sys_dept dt
-        JOIN dept_path dp ON dt.parent_id = dp.child_id
+        FROM sys_dept dt
+        JOIN dept_path dp ON dt.parent_id = dp.child_id AND dt.is_delete = 0
         )
         SELECT
         sd.*,
         COUNT(suji.user_id) AS user_count
-        FROM
-        dept_path dp
-        JOIN sys_dept sd ON sd.id = dp.root_id
-        LEFT JOIN sys_user_jzg_info suji ON suji.dept_id = dp.child_id
-        WHERE
-        sd.is_delete = 0
-        GROUP BY
-        sd.id
-        ORDER BY
-        user_count DESC;
-
+        FROM dept_path dp
+        JOIN sys_dept sd ON sd.id = dp.root_id AND sd.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji ON suji.dept_id = dp.child_id AND suji.is_delete = 0
+        GROUP BY sd.id
+        ORDER BY user_count DESC;
     </select>
-</mapper>
+
+</mapper>

tenant/organization/src/main/resources/mapper/SysDistributionSettingMapper.xml

@@ -13,167 +13,168 @@
         suji2.name as inviteePerson,
         suji.distribution_time as joinTime
         from sys_user_jzg_info suji
-        left join sys_user su on suji.user_id = su.id
-        left join sys_dept sd on sd.id = suji.dept_id
-        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id
-        where
-        1=1
-        and suji.is_distribution = 1
-        <if test="sysDistributionListVo.name != null and sysDistributionListVo.name != ''">
-            and suji.name = #{sysDistributionListVo.name}
-        </if>
-        <if test="sysDistributionListVo.mobile != null and sysDistributionListVo.mobile != ''">
-            and su.mobile = #{sysDistributionListVo.mobile}
-        </if>
-        <if test ="sysDistributionListVo.inviteePerson != null and sysDistributionListVo.inviteePerson != ''">
-            and suji2.name = #{sysDistributionListVo.inviteePerson}
-        </if>
-        <if test="sysDistributionListVo.joinTimeStart != null and sysDistributionListVo.joinTimeStart != ''">
-            and suji.distribution_time between #{sysDistributionListVo.joinTimeStart} and #{sysDistributionListVo.joinTimeEnd}
-        </if>
+        left join sys_user su on suji.user_id = su.id AND su.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id AND suji2.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and suji.is_distribution = 1
+            <if test="sysDistributionListVo.name != null and sysDistributionListVo.name != ''">
+                and suji.name = #{sysDistributionListVo.name}
+            </if>
+            <if test="sysDistributionListVo.mobile != null and sysDistributionListVo.mobile != ''">
+                and su.mobile = #{sysDistributionListVo.mobile}
+            </if>
+            <if test ="sysDistributionListVo.inviteePerson != null and sysDistributionListVo.inviteePerson != ''">
+                and suji2.name = #{sysDistributionListVo.inviteePerson}
+            </if>
+            <if test="sysDistributionListVo.joinTimeStart != null and sysDistributionListVo.joinTimeStart != ''">
+                and suji.distribution_time between #{sysDistributionListVo.joinTimeStart} and #{sysDistributionListVo.joinTimeEnd}
+            </if>
+        </where>
+        ORDER BY suji.id DESC
     </select>
 
     <select id="distributorAuditList" resultType="com.jzg.commons.entity.vo.SysDistributionAuditListVo">
         select
-            sda.id as id,
-            sda.remark as remark,
-            suji.name as name,
-            sd.name as deptName,
-            suji.type_attr as typeAttr,
-            su.mobile as mobile,
-            sda.apply_time as applyTime,
-            sda.audit_time as auditTime,
-            suji3.name as auditPerson,
-            suji.referrer_id as referrerId,
-            suji2.name as referrerName
+        sda.id as id,
+        sda.remark as remark,
+        suji.name as name,
+        sd.name as deptName,
+        suji.type_attr as typeAttr,
+        su.mobile as mobile,
+        sda.apply_time as applyTime,
+        sda.audit_time as auditTime,
+        suji3.name as auditPerson,
+        suji.referrer_id as referrerId,
+        suji2.name as referrerName
         from sys_distribution_audit sda
-        left join sys_user_jzg_info suji on sda.sys_user_jzg_info_id = suji.id
-        left join sys_user su on suji.user_id = su.id
-        left join sys_dept sd on sd.id = suji.dept_id
-        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id
-        left join sys_user su2 on su2.mobile = sda.audit_by
-        LEFT JOIN sys_user_jzg_info suji3 ON suji3.user_id = su2.id
-        where
-            1=1
-        <if test="sysDistributionAuditVo.name != null and sysDistributionAuditVo.name != ''">
-            and suji.name = #{sysDistributionAuditVo.name}
-        </if>
-        <if test="sysDistributionAuditVo.mobile != null and sysDistributionAuditVo.mobile != ''">
-            and su.mobile = #{sysDistributionAuditVo.mobile}
-        </if>
-        <if test ="sysDistributionAuditVo.inviteePerson != null and sysDistributionAuditVo.inviteePerson != ''">
-            and suji2.name = #{sysDistributionAuditVo.inviteePerson}
-        </if>
-        <if test="sysDistributionAuditVo.applyTimeStart != null">
-            and sda.apply_time between #{sysDistributionAuditVo.applyTimeStart} and #{sysDistributionAuditVo.applyTimeEnd}
-        </if>
-        <if test="sysDistributionAuditVo.auditStatus != null and sysDistributionAuditVo.auditStatus != ''">
-            and sda.audit_status = #{sysDistributionAuditVo.auditStatus}
-        </if>
-        <if test="sysDistributionAuditVo.systemCode != null and sysDistributionAuditVo.systemCode != ''">
-            and suji.system_code = #{sysDistributionAuditVo.systemCode}
-        </if>
-        <if test="sysDistributionAuditVo.systemCode != null and sysDistributionAuditVo.systemCode != ''">
-            and suji.system_code = #{sysDistributionAudit}
-        </if>
-        <if test="sysDistributionAuditVo.auditPerson != null and sysDistributionAuditVo.auditPerson != ''">
-            and sda.audit_by = #{sysDistributionAuditVo.auditPerson}
-        </if>
-        <if test="sysDistributionAuditVo.auditTimeStart != null">
-            and sda.audit_time between #{sysDistributionAuditVo.auditTimeStart} and #{sysDistributionAuditVo.auditTimeEnd}
-        </if>
+        left join sys_user_jzg_info suji on sda.sys_user_jzg_info_id = suji.id AND suji.is_delete = 0
+        left join sys_user su on suji.user_id = su.id AND su.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id AND suji2.is_delete = 0
+        left join sys_user su2 on su2.mobile = sda.audit_by AND su2.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji3 ON suji3.user_id = su2.id AND suji3.is_delete = 0
+        <where>
+            sda.is_delete = 0
+            <if test="sysDistributionAuditVo.name != null and sysDistributionAuditVo.name != ''">
+                and suji.name = #{sysDistributionAuditVo.name}
+            </if>
+            <if test="sysDistributionAuditVo.mobile != null and sysDistributionAuditVo.mobile != ''">
+                and su.mobile = #{sysDistributionAuditVo.mobile}
+            </if>
+            <if test ="sysDistributionAuditVo.inviteePerson != null and sysDistributionAuditVo.inviteePerson != ''">
+                and suji2.name = #{sysDistributionAuditVo.inviteePerson}
+            </if>
+            <if test="sysDistributionAuditVo.applyTimeStart != null">
+                and sda.apply_time between #{sysDistributionAuditVo.applyTimeStart} and #{sysDistributionAuditVo.applyTimeEnd}
+            </if>
+            <if test="sysDistributionAuditVo.auditStatus != null and sysDistributionAuditVo.auditStatus != ''">
+                and sda.audit_status = #{sysDistributionAuditVo.auditStatus}
+            </if>
+            <if test="sysDistributionAuditVo.systemCode != null and sysDistributionAuditVo.systemCode != ''">
+                and suji.system_code = #{sysDistributionAuditVo.systemCode}
+            </if>
+            <if test="sysDistributionAuditVo.auditPerson != null and sysDistributionAuditVo.auditPerson != ''">
+                and sda.audit_by = #{sysDistributionAuditVo.auditPerson}
+            </if>
+            <if test="sysDistributionAuditVo.auditTimeStart != null">
+                and sda.audit_time between #{sysDistributionAuditVo.auditTimeStart} and #{sysDistributionAuditVo.auditTimeEnd}
+            </if>
+        </where>
+        ORDER BY sda.id DESC
     </select>
 
     <select id="commissionDetails" resultType="com.jzg.commons.entity.vo.DistributionCommissionDetailVo">
         SELECT
-            ifo.order_no AS orderNo,
-            ifo.total_premium AS premium,
-            io.real_quote_user_id AS salesman,
-            io.real_quote_user_id AS salesmanMobile,
-            io.signing_time AS signingTime,
-            suji.name as distributor,
-            su.mobile as distributorMobile,
-            ifo.first_distribution_fee as commission,
-            ifo.first_distribution_ratio AS distributionRatio,
-            '1' AS distributionLevel -- 标识为一级分销
+        ifo.order_no AS orderNo,
+        ifo.total_premium AS premium,
+        io.real_quote_user_id AS salesman,
+        io.real_quote_user_id AS salesmanMobile,
+        io.signing_time AS signingTime,
+        suji.name as distributor,
+        su.mobile as distributorMobile,
+        ifo.first_distribution_fee as commission,
+        ifo.first_distribution_ratio AS distributionRatio,
+        '1' AS distributionLevel -- 标识为一级分销
         FROM
-            ins_fee_orders ifo
-                LEFT JOIN ins_orders io ON ifo.order_no = io.id
-                LEFT JOIN sys_user_jzg_info suji ON ifo.first_distributor_id = suji.id
-                left join sys_user su on su.id = suji.user_id
+        ins_fee_orders ifo
+        LEFT JOIN ins_orders io ON ifo.order_no = io.id
+        LEFT JOIN sys_user_jzg_info suji ON ifo.first_distributor_id = suji.id AND suji.is_delete = 0
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
         WHERE
-            1=1
-                and ifo.first_distributor_id IS NOT NULL
-            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
-                and suji.name = #{distributionCommissionDetailVo.distributor}
-            </if>
-            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
-                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
-            </if>
-            <if test="distributionCommissionDetailVo.signingTimeStart != null">
-                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
-            </if>
+        ifo.is_delete = 0
+        and ifo.first_distributor_id IS NOT NULL
+        <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+            and suji.name = #{distributionCommissionDetailVo.distributor}
+        </if>
+        <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+            and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+        </if>
+        <if test="distributionCommissionDetailVo.signingTimeStart != null">
+            and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+        </if>
         UNION ALL
         SELECT
-            ifo.order_no AS orderNo,
-            ifo.total_premium AS premium,
-            io.real_quote_user_id AS salesman,
-            io.real_quote_user_id AS salesmanMobile,
-            io.signing_time AS signingTime,
-            suji.name as distributor,
-            su.mobile as distributorMobile,
-            ifo.second_distribution_fee as commission,
-            ifo.second_distribution_ratio AS distributionRatio,
-            '2' AS distributionLevel -- 标识为二级分销
+        ifo.order_no AS orderNo,
+        ifo.total_premium AS premium,
+        io.real_quote_user_id AS salesman,
+        io.real_quote_user_id AS salesmanMobile,
+        io.signing_time AS signingTime,
+        suji.name as distributor,
+        su.mobile as distributorMobile,
+        ifo.second_distribution_fee as commission,
+        ifo.second_distribution_ratio AS distributionRatio,
+        '2' AS distributionLevel -- 标识为二级分销
         FROM
-            ins_fee_orders ifo
-                LEFT JOIN ins_orders io ON ifo.order_no = io.id
-                LEFT JOIN sys_user_jzg_info suji ON ifo.second_distributor_id = suji.id
-                left join sys_user su on su.id = suji.user_id
+        ins_fee_orders ifo
+        LEFT JOIN ins_orders io ON ifo.order_no = io.id
+        LEFT JOIN sys_user_jzg_info suji ON ifo.second_distributor_id = suji.id AND suji.is_delete = 0
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
         WHERE
-            1=1
-                and ifo.second_distributor_id IS NOT NULL
-            <if test="distributionCommissionDetailVo.signingTimeStart != null">
-                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
-            </if>
-            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
-                and suji.name = #{distributionCommissionDetailVo.distributor}
-            </if>
-            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
-                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
-            </if>
+        ifo.is_delete = 0
+        and ifo.second_distributor_id IS NOT NULL
+        <if test="distributionCommissionDetailVo.signingTimeStart != null">
+            and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+        </if>
+        <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+            and suji.name = #{distributionCommissionDetailVo.distributor}
+        </if>
+        <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+            and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+        </if>
         UNION ALL
         SELECT
-            ifo.order_no AS orderNo,
-            ifo.total_premium AS premium,
-            io.real_quote_user_id AS salesman,
-            io.real_quote_user_id AS salesmanMobile,
-            io.signing_time AS signingTime,
-            suji.name  AS distributor,
-            su.mobile as distributorMobile,
-            ifo.third_distribution_fee as commission,
-            ifo.third_distribution_ratio AS distributionRatio,
-            '3' AS distributionLevel
+        ifo.order_no AS orderNo,
+        ifo.total_premium AS premium,
+        io.real_quote_user_id AS salesman,
+        io.real_quote_user_id AS salesmanMobile,
+        io.signing_time AS signingTime,
+        suji.name  AS distributor,
+        su.mobile as distributorMobile,
+        ifo.third_distribution_fee as commission,
+        ifo.third_distribution_ratio AS distributionRatio,
+        '3' AS distributionLevel
         FROM
-            ins_fee_orders ifo
-                LEFT JOIN ins_orders io ON ifo.order_no = io.id
-                LEFT JOIN sys_user_jzg_info suji ON ifo.third_distributor_id = suji.id
-                left join sys_user su on su.id = suji.user_id
+        ins_fee_orders ifo
+        LEFT JOIN ins_orders io ON ifo.order_no = io.id
+        LEFT JOIN sys_user_jzg_info suji ON ifo.third_distributor_id = suji.id AND suji.is_delete = 0
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
         WHERE
-            1=1
-                and ifo.third_distributor_id IS NOT NULL
-            <if test="distributionCommissionDetailVo.signingTimeStart != null">
-                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
-            </if>
-            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
-                and suji.name = #{distributionCommissionDetailVo.distributor}
-            </if>
-            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
-                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
-            </if>
+        ifo.is_delete = 0
+        and ifo.third_distributor_id IS NOT NULL
+        <if test="distributionCommissionDetailVo.signingTimeStart != null">
+            and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+        </if>
+        <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+            and suji.name = #{distributionCommissionDetailVo.distributor}
+        </if>
+        <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+            and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+        </if>
         ORDER BY
-            orderNo,
-            distributionLevel
+        orderNo,
+        distributionLevel
     </select>
 
     <select id="distributionTeam" resultType="com.jzg.commons.entity.vo.DistributionTeamVo">
@@ -186,12 +187,13 @@
         1 as level
         FROM
         esm_user_referrer eur1
-        LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id
-        LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id
-        LEFT JOIN sys_user su ON su.id = suji.user_id
-        left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+        LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id AND suji.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id AND suji1.is_delete = 0
+        LEFT JOIN sys_user su ON su.id = suji.user_id AND su.is_delete = 0
+        left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id AND sda.is_delete = 0
         WHERE
-        eur1.referrer_id = #{topReferrerId}
+        eur1.is_delete = 0
+        and eur1.referrer_id = #{topReferrerId}
         and sda.audit_status = '1'
         AND suji.id IS NOT NULL
         <if test="maxLevel >= 2">
@@ -204,12 +206,12 @@
             sda.audit_approval_time as joinTime,
             2 as level
             FROM
-            esm_user_referrer eur1  -- 一级推荐关系
-            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id  -- 二级推荐关系
-            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id  -- 一级用户
-            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id  -- 二级用户
-            LEFT JOIN sys_user su2 ON su2.id = suji2.user_id
-            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+            esm_user_referrer eur1
+            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id
+            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id AND suji.is_delete = 0
+            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id AND suji2.is_delete = 0
+            LEFT JOIN sys_user su2 ON su2.id = suji2.user_id AND su2.is_delete = 0
+            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id AND sda.is_delete = 0
             WHERE
             eur1.referrer_id = #{topReferrerId}
             and sda.audit_status = '1'
@@ -225,19 +227,20 @@
             sda.audit_approval_time as joinTime,
             3 as level
             FROM
-            esm_user_referrer eur1  -- 一级推荐关系
-            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id  -- 二级推荐关系
-            LEFT JOIN esm_user_referrer eur3 ON eur3.referrer_id = eur2.id  -- 三级推荐关系
-            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id  -- 一级用户
-            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id  -- 二级用户
-            LEFT JOIN sys_user_jzg_info suji3 ON suji3.id = eur3.id  -- 三级用户
-            LEFT JOIN sys_user su3 ON su3.id = suji3.user_id
-            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+            esm_user_referrer eur1
+            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id
+            LEFT JOIN esm_user_referrer eur3 ON eur3.referrer_id = eur2.id
+            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id AND suji.is_delete = 0
+            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id AND suji2.is_delete = 0
+            LEFT JOIN sys_user_jzg_info suji3 ON suji3.id = eur3.id AND suji3.is_delete = 0
+            LEFT JOIN sys_user su3 ON su3.id = suji3.user_id AND su3.is_delete = 0
+            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id AND sda.is_delete = 0
             WHERE
             eur1.referrer_id = #{topReferrerId}
             and sda.audit_status = '1'
             AND suji3.id IS NOT NULL
         </if>
+        ORDER BY eur1.id DESC
     </select>
 
     <select id="getDistributionOrder" resultType="com.jzg.commons.entity.vo.DistributionOrder">
@@ -255,51 +258,50 @@
         WHEN ifo.first_distributor_id = #{distributionOrderVo.userId} THEN 1
         WHEN ifo.second_distributor_id =  #{distributionOrderVo.userId} THEN 2
         WHEN ifo.third_distributor_id =  #{distributionOrderVo.userId} THEN 3
-        END AS level  -- 标识该订单属于哪个分销等级
+        END AS level
         FROM sys_user_jzg_info suji
-        LEFT JOIN sys_user su ON su.id = suji.user_id
-        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id
-        LEFT JOIN ins_fee_orders ifo ON ifo.first_distributor_id = #{distributionOrderVo.userId}  -- 1级分销匹配
-        OR ifo.second_distributor_id = #{distributionOrderVo.userId} -- 2级分销匹配
-        OR ifo.third_distributor_id = #{distributionOrderVo.userId}  -- 3级分销匹配
-        LEFT JOIN ins_fee_audit ifa
-        ON CAST(ifo.order_no AS CHAR) = ifa.order_no  -- 显式转类型，避免隐式转换报错
-        AND ifa.is_delete = 0
-        LEFT JOIN ins_orders io ON io.id = ifo.order_no
-        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
-        WHERE 1=1
-        <if test="distributionOrderVo.level == null">
-            AND (
-            ifo.first_distributor_id = #{distributionOrderVo.userId}
-            OR ifo.second_distributor_id = #{distributionOrderVo.userId}
-            OR ifo.third_distributor_id = #{distributionOrderVo.userId}
-            )
-        </if>
-        -- 分销等级筛选（仅当level不为空时生效）
-        <if test="distributionOrderVo.level != null">
-            AND (
-            CASE
-            WHEN #{distributionOrderVo.level} = 1 THEN ifo.first_distributor_id = #{distributionOrderVo.userId}
-            WHEN #{distributionOrderVo.level} = 2 THEN ifo.second_distributor_id = #{distributionOrderVo.userId}
-            WHEN #{distributionOrderVo.level} = 3 THEN ifo.third_distributor_id = #{distributionOrderVo.userId}
-            END
-            )
-        </if>
-        -- 审核状态筛选（仅当auditStatus不为空时生效，去掉多余的!= ''判断）
-        <if test="distributionOrderVo.auditStatus != null">
-            AND (
-            CASE
-            WHEN #{distributionOrderVo.auditStatus} = 1 THEN ifa.audit_status = 1  -- 仅查审核通过
-            WHEN #{distributionOrderVo.auditStatus} = 0 THEN ifa.audit_status IN (1, 2)  -- 查通过+不通过
-            END
-            )
-        </if>
-        <if test="distributionOrderVo.signingTimeStart != null">
-            and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
-        </if>
-        <if test="distributionOrderVo.userId != null">
-            AND suji.id = #{distributionOrderVo.userId}
-        </if>
+        LEFT JOIN sys_user su ON su.id = suji.user_id AND su.is_delete = 0
+        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id AND suji1.is_delete = 0
+        LEFT JOIN ins_fee_orders ifo ON ifo.first_distributor_id = #{distributionOrderVo.userId}
+        OR ifo.second_distributor_id = #{distributionOrderVo.userId}
+        OR ifo.third_distributor_id = #{distributionOrderVo.userId}
+            and ifo.is_delete = 0
+        LEFT JOIN ins_fee_audit ifa ON CAST(ifo.order_no AS CHAR) = ifa.order_no AND ifa.is_delete = 0
+        LEFT JOIN ins_orders io ON io.id = ifo.order_no and io.is_delete = 0
+        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id and ioci.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            <if test="distributionOrderVo.level == null">
+                AND (
+                ifo.first_distributor_id = #{distributionOrderVo.userId}
+                OR ifo.second_distributor_id = #{distributionOrderVo.userId}
+                OR ifo.third_distributor_id = #{distributionOrderVo.userId}
+                )
+            </if>
+            <if test="distributionOrderVo.level != null">
+                AND (
+                CASE
+                WHEN #{distributionOrderVo.level} = 1 THEN ifo.first_distributor_id = #{distributionOrderVo.userId}
+                WHEN #{distributionOrderVo.level} = 2 THEN ifo.second_distributor_id = #{distributionOrderVo.userId}
+                WHEN #{distributionOrderVo.level} = 3 THEN ifo.third_distributor_id = #{distributionOrderVo.userId}
+                END
+                )
+            </if>
+            <if test="distributionOrderVo.auditStatus != null">
+                AND (
+                CASE
+                WHEN #{distributionOrderVo.auditStatus} = 1 THEN ifa.audit_status = 1
+                WHEN #{distributionOrderVo.auditStatus} = 0 THEN ifa.audit_status IN (1, 2)
+                END
+                )
+            </if>
+            <if test="distributionOrderVo.signingTimeStart != null">
+                and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
+            </if>
+            <if test="distributionOrderVo.userId != null">
+                AND suji.id = #{distributionOrderVo.userId}
+            </if>
+        </where>
         order by io.signing_time desc
     </select>
 
@@ -320,8 +322,8 @@
         END AS commission,
         #{distributionOrderVo.level} AS level
         FROM sys_user_jzg_info suji
-        LEFT JOIN sys_user su ON su.id = suji.user_id
-        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id
+        LEFT JOIN sys_user su ON su.id = suji.user_id AND su.is_delete = 0
+        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id AND suji1.is_delete = 0
         LEFT JOIN ins_fee_orders ifo on 1=1
         <if test="distributionOrderVo.level != null">
             <choose>
@@ -330,37 +332,42 @@
                 <when test="distributionOrderVo.level == '3'">AND ifo.third_distributor_id = suji.id</when>
             </choose>
         </if>
-        left join ins_fee_audit ifa on ifa.order_no = ifo.order_no and ifa.audit_status
-        LEFT JOIN ins_orders io ON io.id = ifo.order_no
-        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
-        WHERE 1=1
-        <if test="distributionOrderVo.userId != null and distributionOrderVo.userId != ''">
-            AND suji.id = #{distributionOrderVo.userId}
-        </if>
-        <if test="distributionOrderVo.signingTimeStart != null">
-            and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
-        </if>
-
+        left join ins_fee_audit ifa on ifa.order_no = ifo.order_no and ifa.audit_status = 1 AND ifa.is_delete = 0
+        LEFT JOIN ins_orders io ON io.id = ifo.order_no AND io.is_delete = 0
+        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id AND ioci.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            <if test="distributionOrderVo.userId != null and distributionOrderVo.userId != ''">
+                AND suji.id = #{distributionOrderVo.userId}
+            </if>
+            <if test="distributionOrderVo.signingTimeStart != null">
+                and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
+            </if>
+        </where>
+        ORDER BY suji.id DESC
     </select>
 
     <select id="inviteeDistributor" resultType="com.jzg.commons.entity.vo.DistributionTeamVo">
         SELECT
-            suji.id as id,
-            suji.NAME AS name,
-            suji1.name AS inviteePerson,
-            su.mobile as mobile,
-            sda.audit_approval_time as joinTime,
-            #{level} as level
+        suji.id as id,
+        suji.NAME AS name,
+        suji1.name AS inviteePerson,
+        su.mobile as mobile,
+        sda.audit_approval_time as joinTime,
+        #{level} as level
         FROM
-            esm_user_referrer eur1
-                LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id
-                LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id
-                LEFT JOIN sys_user su ON su.id = suji.user_id
-                left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
-        WHERE
-            eur1.referrer_id = #{id}
-          and sda.audit_status = '1'
-          AND suji.id IS NOT NULL
+        esm_user_referrer eur1
+        LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id AND suji.is_delete = 0
+        LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id AND suji1.is_delete = 0
+        LEFT JOIN sys_user su ON su.id = suji.user_id AND su.is_delete = 0
+        left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id AND sda.is_delete = 0
+        <where>
+            eur1.is_delete = 0
+            and eur1.referrer_id = #{id}
+            and sda.audit_status = '1'
+            AND suji.id IS NOT NULL
+        </where>
+        ORDER BY suji.id DESC
     </select>
 
 </mapper>

tenant/organization/src/main/resources/mapper/SysMessageMapper.xml

@@ -5,55 +5,58 @@
 <mapper namespace="com.jzg.organization.mapper.SysMessageMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysMessage">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="title" column="title" jdbcType="VARCHAR"/>
-            <result property="content" column="content" jdbcType="VARCHAR"/>
-            <result property="tplCode" column="tpl_code" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="title" column="title" jdbcType="VARCHAR"/>
+        <result property="content" column="content" jdbcType="VARCHAR"/>
+        <result property="tplCode" column="tpl_code" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,title,content,tpl_id
+        id,title,content,tpl_id,
         tpl_code,create_by,create_time,
         update_by,update_time,is_delete
     </sql>
+
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.MessageVo">
         SELECT sm.id, sm.title, sm.content, smt.id AS tplId,
         sm.tpl_code AS tplCode,sm.create_by as createBy,sm.create_time as createTime,
         sm.update_by as updateBy,sm.update_time as updateTime,sm.is_delete as isDelete,sm.system_code as systemCode,
         smu.user_id as userId, smu.is_read as isRead ,smt.type as tplType
         FROM sys_message_user smu
-        LEFT JOIN sys_message sm on smu.message_id = sm.id
-        LEFT JOIN sys_message_template smt on sm.tpl_code = smt.tpl_code
+        LEFT JOIN sys_message sm on smu.message_id = sm.id AND sm.is_delete = 0
+        LEFT JOIN sys_message_template smt on sm.tpl_code = smt.tpl_code AND smt.is_delete = 0
         <where>
+            smu.is_delete = 0
             <if test="param.type != null">
                 and smt.type = #{param.type}
             </if>
-
             <if test="param.userId != null and param.userId != ''">
                 and smu.user_id = #{param.userId}
             </if>
         </where>
         ORDER BY sm.create_time DESC
     </select>
+
     <select id="queryList" resultType="com.jzg.commons.entity.vo.MessageVo">
         SELECT sm.id, sm.title, sm.content,
         sm.tpl_code AS tplCode,sm.create_by as createBy,sm.create_time as createTime,
         sm.update_by as updateBy,sm.update_time as updateTime,sm.is_delete as isDelete,sm.system_code as systemCode,
         smu.user_id as userId, smu.is_read as isRead ,smt.type as tplType
         FROM sys_message_user smu
-        LEFT JOIN sys_message sm on smu.message_id = sm.id
-        LEFT JOIN sys_message_template smt on sm.tpl_code = smt.tpl_code
+        LEFT JOIN sys_message sm on smu.message_id = sm.id AND sm.is_delete = 0
+        LEFT JOIN sys_message_template smt on sm.tpl_code = smt.tpl_code AND smt.is_delete = 0
         <where>
-            sm.id is not null
+            smu.is_delete = 0
+            and sm.id is not null
             <if test="userId != null and userId != ''">
                 and smu.user_id = #{userId}
             </if>
         </where>
         ORDER BY sm.create_time DESC
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysMessageNoticeMapper.xml

@@ -5,16 +5,16 @@
 <mapper namespace="com.jzg.organization.mapper.SysMessageNoticeMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysMessageNotice">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="content" column="content" jdbcType="VARCHAR"/>
-            <result property="sendDeptId" column="send_dept_id" jdbcType="VARCHAR"/>
-            <result property="isChildren" column="is_children" jdbcType="TINYINT"/>
-            <result property="isForce" column="is_force" jdbcType="TINYINT"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="content" column="content" jdbcType="VARCHAR"/>
+        <result property="sendDeptId" column="send_dept_id" jdbcType="VARCHAR"/>
+        <result property="isChildren" column="is_children" jdbcType="TINYINT"/>
+        <result property="isForce" column="is_force" jdbcType="TINYINT"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -23,10 +23,11 @@
         smn.create_time,smn.update_by,smn.update_time,
         smn.is_delete,smn.system_code
     </sql>
+
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.MessageNoticeVo">
         select <include refid="Base_Column_List"/>,COUNT(snu.id) as viewCount
         FROM sys_message_notice smn
-        LEFT JOIN sys_notice_user snu on smn.id = snu.notice_id
+        LEFT JOIN sys_notice_user snu on smn.id = snu.notice_id AND snu.is_delete = 0
         <where>
             smn.is_delete = 0
             <if test="param.sendDeptId != null and param.sendDeptId != ''">
@@ -40,5 +41,4 @@
         order by smn.create_time desc
     </select>
 
-
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysNoticeUserMapper.xml

@@ -5,23 +5,26 @@
 <mapper namespace="com.jzg.organization.mapper.SysNoticeUserMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysNoticeUser">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="noticeId" column="notice_id" jdbcType="VARCHAR"/>
-            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="noticeId" column="notice_id" jdbcType="VARCHAR"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,notice_id,user_id
     </sql>
+
     <select id="queryUserPage" resultType="com.jzg.commons.entity.vo.NoticeUserVo">
         SELECT snu.user_id as userId ,suji.name, su.mobile, suji.work_number as workNumber,suji.dept_id,snu.create_time as createTime
         FROM sys_notice_user snu
-        LEFT JOIN sys_user_jzg_info suji on snu.user_id = suji.id
-        LEFT JOIN sys_user su on su.id = suji.user_id
+        LEFT JOIN sys_user_jzg_info suji on snu.user_id = suji.id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = suji.user_id AND su.is_delete = 0
         <where>
+            snu.is_delete = 0
             <if test="param.id != null and param.id != ''">
                 and snu.notice_id = #{param.id}
             </if>
         </where>
+        ORDER BY snu.id DESC
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -12,16 +12,15 @@
         <result column="deptName" property="deptName"/>
         <result column="memberNumber" property="memberNumber"/>
         <result column="describe_information" property="describeInformation"/>
-
     </resultMap>
 
     <select id="selectLeftList" resultMap="leftSysOrganizationVo">
         select id, system_code, name, dept_id, manager_id, describe_information, attribute,
-        (SELECT COUNT(1) FROM sys_organization_user_link WHERE sys_organization_user_link.organization_id = sys_organization.id) memberNumber,
-        (SELECT sys_dept.`name` FROM sys_dept WHERE sys_dept.id = sys_organization.dept_id) deptName,
+        (SELECT COUNT(1) FROM sys_organization_user_link WHERE sys_organization_user_link.organization_id = sys_organization.id AND sys_organization_user_link.is_delete = 0) memberNumber,
+        (SELECT sys_dept.`name` FROM sys_dept WHERE sys_dept.id = sys_organization.dept_id AND sys_dept.is_delete = 0) deptName,
         (SELECT suji.name
         FROM sys_user_jzg_info suji
-        WHERE suji.id = sys_organization.manager_id) manager_name
+        WHERE suji.id = sys_organization.manager_id AND suji.is_delete = 0) manager_name
         from sys_organization
         <where>
             is_delete = 0
@@ -32,6 +31,7 @@
                 and sys_organization.attribute = #{params.attribute}
             </if>
         </where>
+        ORDER BY id DESC
     </select>
 
     <!-- 查询用户关联的团队信息 lipf 2026年4月27日10:06:10 -->
@@ -42,10 +42,12 @@
         so.system_code,
         soul.organization_id,
         soul.user_id
-        FROM
-        sys_organization so
-        INNER JOIN sys_organization_user_link soul ON
-        so.id = soul.organization_id
+        FROM sys_organization so
+        INNER JOIN sys_organization_user_link soul ON so.id = soul.organization_id AND soul.is_delete = 0
+        <where>
+            so.is_delete = 0
+        </where>
+        ORDER BY so.id DESC
     </select>
 
     <select id="getTeamUserPage" resultType="com.jzg.commons.entity.vo.SysOrganizationUserLinkVo">
@@ -65,18 +67,17 @@
         led_suji.name as leader_name,
         led_su.mobile as leader_id,
         so.name as organization_name
-        FROM
-        sys_organization so
-        INNER JOIN sys_organization_user_link soul ON so.id = soul.organization_id
-        INNER JOIN sys_user su ON su.id = soul.user_id
-        INNER JOIN sys_user_jzg_info suji ON suji.user_id = soul.user_id
-        LEFT JOIN sys_dept sd ON suji.dept_id = sd.id
-        left join sys_user_jzg_info ref_suji on ref_suji.id = suji.referrer_id
-        left join sys_user ref_su on ref_su.id = ref_suji.user_id
-        left join sys_user_jzg_info led_suji on led_suji.id = suji.leader_id
-        left join sys_user led_su on led_su.id = led_suji.user_id
+        FROM sys_organization so
+        INNER JOIN sys_organization_user_link soul ON so.id = soul.organization_id AND soul.is_delete = 0
+        INNER JOIN sys_user su ON su.id = soul.user_id AND su.is_delete = 0
+        INNER JOIN sys_user_jzg_info suji ON suji.user_id = soul.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_dept sd ON suji.dept_id = sd.id AND sd.is_delete = 0
+        LEFT JOIN sys_user_jzg_info ref_suji on ref_suji.id = suji.referrer_id AND ref_suji.is_delete = 0
+        LEFT JOIN sys_user ref_su on ref_su.id = ref_suji.user_id AND ref_su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info led_suji on led_suji.id = suji.leader_id AND led_suji.is_delete = 0
+        LEFT JOIN sys_user led_su on led_su.id = led_suji.user_id AND led_su.is_delete = 0
         <where>
-            su.is_delete = 0 and suji.is_delete = 0
+            so.is_delete = 0
             <if test="param.id != null and param.id != ''">
                 and so.id = #{param.id}
             </if>
@@ -84,6 +85,7 @@
                 and ( su.username like concat('%',#{param.name},'%') or suji.name like concat('%',#{param.name},'%') or su.id like concat('%',#{param.name},'%') )
             </if>
         </where>
+        ORDER BY suji.id DESC
     </select>
 
 </mapper>

tenant/organization/src/main/resources/mapper/SysOrganizationUserLinkServiceMapper.xml

@@ -28,11 +28,13 @@
         a.id,
         a.user_id,
         a.organization_id
-        FROM
-        sys_organization_user_link a
-        join sys_organization b on
-        a.organization_id = b.id
-        WHERE user_id = #{userId,jdbcType=DECIMAL}
+        FROM sys_organization_user_link a
+        JOIN sys_organization b ON a.organization_id = b.id AND b.is_delete = 0
+        <where>
+            a.is_delete = 0
+            AND user_id = #{userId,jdbcType=DECIMAL}
+        </where>
+        ORDER BY a.id DESC
     </select>
 
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserAccountMapper.xml

@@ -5,16 +5,16 @@
 <mapper namespace="com.jzg.organization.mapper.SysUserAccountMapper">
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysUserAccount">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
-            <result property="sumAmount" column="sum_amount" jdbcType="DECIMAL"/>
-            <result property="sumAmountPaid" column="sum_amount_paid" jdbcType="DECIMAL"/>
-            <result property="sumAmountUnpaid" column="sum_amount_unpaid" jdbcType="DECIMAL"/>
-            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="sumAmount" column="sum_amount" jdbcType="DECIMAL"/>
+        <result property="sumAmountPaid" column="sum_amount_paid" jdbcType="DECIMAL"/>
+        <result property="sumAmountUnpaid" column="sum_amount_unpaid" jdbcType="DECIMAL"/>
+        <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -23,17 +23,18 @@
         create_time,create_by,update_time,
         update_by
     </sql>
+
     <select id="getPayableStatistics" resultType="com.jzg.commons.entity.vo.UserAccountStatisVo">
         SELECT
-            COUNT(DISTINCT sua.user_id) AS salespersonCount,                          -- 业务员人数
-            ROUND(SUM(sua.sum_amount), 2) AS payableSum,                               -- 应付总计
-            ROUND(SUM(sua.sum_amount_paid), 2) AS paidSum,                                      -- 已付总计
-            ROUND(SUM(sua.sum_amount_unpaid), 2) AS notPaidSum                   -- 未付总计
-        FROM
-            sys_user_account sua
-            INNER JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id
-            INNER JOIN sys_user su on su.id = suji.user_id
+        COUNT(DISTINCT sua.user_id) AS salespersonCount,
+        ROUND(SUM(sua.sum_amount), 2) AS payableSum,
+        ROUND(SUM(sua.sum_amount_paid), 2) AS paidSum,
+        ROUND(SUM(sua.sum_amount_unpaid), 2) AS notPaidSum
+        FROM sys_user_account sua
+        INNER JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id AND suji.is_delete = 0
+        INNER JOIN sys_user su on su.id = suji.user_id AND su.is_delete = 0
         <where>
+            sua.is_delete = 0
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
             </if>
@@ -44,23 +45,23 @@
                 and DATE_FORMAT(sua.create_time, '%Y-%m-%d') between #{param.createTimeStart} AND #{param.createTimeEnd}
             </if>
         </where>
-
     </select>
+
     <select id="accountList" resultType="com.jzg.commons.entity.vo.SysUserAccountVo">
         SELECT
-        sua.id, suji.user_id , suji.system_code, suji.name,su.mobile, suji.type_attr as attrType, so.name as organizationName,
+        sua.id, suji.user_id, suji.system_code, suji.name, su.mobile, suji.type_attr as attrType, so.name as organizationName,
         sd.name as deptName, sua.sum_amount as sumAmount, sua.sum_amount_paid as sumAmountPaid,
         sua.sum_amount_unpaid as sumAmountUnpaid, suji.work_number as workNumber,
-        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName
-        FROM
-        sys_user_account sua
-        LEFT JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id
-        LEFT JOIN sys_user su on su.id = suji.user_id
-        LEFT JOIN sys_dept sd on sd.id = suji.dept_id
-        LEFT JOIN sys_organization_user_link soul on soul.user_id = suji.user_id
-        LEFT JOIN sys_organization so on soul.organization_id = so.id
+        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id AND uu.is_delete = 0 ) as leaderName
+        FROM sys_user_account sua
+        LEFT JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        LEFT JOIN sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        LEFT JOIN sys_organization_user_link soul on soul.user_id = suji.user_id AND soul.is_delete = 0
+        LEFT JOIN sys_organization so on soul.organization_id = so.id AND so.is_delete = 0
         <where>
-            suji.system_code is not null
+            sua.is_delete = 0
+            and suji.system_code is not null
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
             </if>
@@ -73,4 +74,5 @@
         </where>
         ORDER BY sua.create_time desc
     </select>
-</mapper>
+
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgAppMapper.xml

@@ -5,28 +5,31 @@
 
     <select id="authInfoGet" resultType="com.jzg.commons.entity.vo.AuthInfoVo">
         SELECT su.username as name, su.auth_status as authStatus,su.mobile,
-               su.identity, su.identity_time_start as identityTimeStart,
-               su.identity_time_end as identityTimeEnd,su.id as userId,sujz.auth_result as authResult
+        su.identity, su.identity_time_start as identityTimeStart,
+        su.identity_time_end as identityTimeEnd,su.id as userId,sujz.auth_result as authResult
         FROM sys_user_jzg_app sujz
-        LEFT JOIN sys_user su ON sujz.user_id = su.id
+        LEFT JOIN sys_user su ON sujz.user_id = su.id AND su.is_delete = 0
         <where>
+            sujz.is_delete = 0
             <if test="id != null">
                 and sujz.id = #{id}
             </if>
         </where>
+        ORDER BY sujz.id DESC
     </select>
+
     <select id="userInfoGet" resultType="com.jzg.commons.entity.vo.UserInfoVo">
         SELECT sujz.id, su.id as userId,sujz.name, su.auth_status as authStatus,su.mobile,
         suf.file_name AS headSculpture, sujz.sex ,
         sujz.referrer_id as referrerId,sur.username as referrerName,sur.mobile as referrerMobile,
         sujz.dept_id as deptId,sd.name as deptName, ss.sys_name as sysName
         FROM sys_user_jzg_app sujz
-        LEFT JOIN sys_user su ON sujz.user_id = su.id
-        LEFT JOIN sys_dept sd on sd.id = sujz.dept_id
-        LEFT JOIN sys_upload_files suf on suf.id = sujz.head_sculpture
-        LEFT JOIN sys_system ss on ss.sys_code = sujz.system_code
-        LEFT JOIN sys_user_jzg_app suja ON  suja.id = sujz.referrer_id
-        LEFT JOIN sys_user sur on sur.id = suja.user_id
+        LEFT JOIN sys_user su ON sujz.user_id = su.id AND su.is_delete = 0
+        LEFT JOIN sys_dept sd on sd.id = sujz.dept_id AND sd.is_delete = 0
+        LEFT JOIN sys_upload_files suf on suf.id = sujz.head_sculpture AND suf.is_delete = 0
+        LEFT JOIN sys_system ss on ss.sys_code = sujz.system_code AND ss.is_delete = 0
+        LEFT JOIN sys_user_jzg_app suja ON  suja.id = sujz.referrer_id AND suja.is_delete = 0
+        LEFT JOIN sys_user sur on sur.id = suja.user_id AND sur.is_delete = 0
         <where>
             sujz.is_delete = 0 and sujz.is_enable = 0
             <if test="systemCode != null and systemCode != ''">
@@ -36,19 +39,21 @@
                 and su.mobile = #{userName}
             </if>
         </where>
-
+        ORDER BY sujz.id DESC
     </select>
+
     <select id="systemListGet" resultType="com.jzg.commons.entity.vo.SystemListVo">
         SELECT ss.sys_name AS sysName, ss.sys_code AS sysCode,
-           sujz.dept_id as deptId,sd.name as deptName
+        sujz.dept_id as deptId,sd.name as deptName
         FROM sys_user_jzg_app sujz
-        LEFT JOIN sys_dept sd on sd.id = sujz.dept_id
-        LEFT JOIN sys_system ss on ss.sys_code = sujz.system_code
+        LEFT JOIN sys_dept sd on sd.id = sujz.dept_id AND sd.is_delete = 0
+        LEFT JOIN sys_system ss on ss.sys_code = sujz.system_code AND ss.is_delete = 0
         <where>
             sujz.is_delete = 0 and sujz.is_enable = 0
             <if test="userId != null and userId != ''">
                 and sujz.user_id = #{userId}
             </if>
         </where>
+        ORDER BY sujz.id DESC
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -15,23 +15,23 @@
 
     <select id="getBankCardByUserId" resultMap="BaseResultMap">
         select
-            sujibc.id as id,
-            suji.name as name,
-            suji.id as userInfoId,
-            sujibc.bank_name as bankName,
-            sujibc.bank_address as bankAddress,
-            sujibc.bank_card_number as bankCardNumber,
-            sujibc.card_holder_mobile as cardHolderMobile,
-            sujibc.audit_status as auditStatus,
-            sujif.file_url as cardFileUrl
+        sujibc.id as id,
+        suji.name as name,
+        suji.id as userInfoId,
+        sujibc.bank_name as bankName,
+        sujibc.bank_address as bankAddress,
+        sujibc.bank_card_number as bankCardNumber,
+        sujibc.card_holder_mobile as cardHolderMobile,
+        sujibc.audit_status as auditStatus,
+        sujif.file_url as cardFileUrl
         from
-            sys_user_jzg_info_bank_card sujibc
-        left join sys_user_jzg_info suji on suji.id = sujibc.user_info_id and suji.system_code = #{systemCode}
-        left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id
-        where
-            1=1
-            and sujibc.is_delete = '0'
+        sys_user_jzg_info_bank_card sujibc
+        left join sys_user_jzg_info suji on suji.id = sujibc.user_info_id and suji.system_code = #{systemCode} AND suji.is_delete = 0
+        left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id AND sujif.is_delete = 0
+        <where>
+            sujibc.is_delete = 0
             and sujibc.user_info_id = #{userInfoId}
+        </where>
     </select>
 
 
@@ -44,43 +44,49 @@
         su.username as username,
         suji.type_attr as typeAttr,
         ss.sys_name as systemName,
-        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName
+        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id AND uu.is_delete = 0 ) as leaderName
         from
         sys_user_jzg_info_bank_card sujibc
-        LEFT JOIN sys_user_jzg_info suji ON suji.id = sujibc.user_info_id
-        LEFT JOIN sys_system ss ON ss.sys_code = sujibc.system_code
-        LEFT JOIN sys_user su ON su.id = suji.user_id
-        where
-            suji.system_code  is not null
-            and sujibc.is_delete = '0'
-        <if test="sysUserJzgInfoBankCardVo.salesman != null and sysUserJzgInfoBankCardVo.salesman != ''">
-            and suji.name = #{sysUserJzgInfoBankCardVo.salesman}
-            or su.mobile = #{sysUserJzgInfoBankCardVo.salesman}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.typeAttr != null and sysUserJzgInfoBankCardVo.typeAttr != ''">
-            and suji.type_attr = #{sysUserJzgInfoBankCardVo.typeAttr}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.applyTimeStart != null and sysUserJzgInfoBankCardVo.applyTimeEnd != null">
-            and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.applyTimeStart} AND #{sysUserJzgInfoBankCardVo.applyTimeEnd}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd != null">
-            and DATE_FORMAT(sujibc.audit_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.auditTimeStart} AND #{sysUserJzgInfoBankCardVo.auditTimeEnd}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.auditBy != null and sysUserJzgInfoBankCardVo.auditBy != ''">
-            and sujibc.audit_by = #{sysUserJzgInfoBankCardVo.auditBy}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.auditStatus != null and sysUserJzgInfoBankCardVo.auditStatus != ''">
-            and sujibc.audit_status = #{sysUserJzgInfoBankCardVo.auditStatus}
-        </if>
-        <if test="sysUserJzgInfoBankCardVo.userId != null and sysUserJzgInfoBankCardVo.userId != ''">
-            and su.id = #{sysUserJzgInfoBankCardVo.userId}
-        </if>
+        LEFT JOIN sys_user_jzg_info suji ON suji.id = sujibc.user_info_id AND suji.is_delete = 0
+        LEFT JOIN sys_system ss ON ss.sys_code = sujibc.system_code AND ss.is_delete = 0
+        LEFT JOIN sys_user su ON su.id = suji.user_id AND su.is_delete = 0
+        <where>
+            sujibc.is_delete = 0
+            and suji.system_code is not null
+            <if test="sysUserJzgInfoBankCardVo.salesman != null and sysUserJzgInfoBankCardVo.salesman != ''">
+                and ( suji.name = #{sysUserJzgInfoBankCardVo.salesman} or su.mobile = #{sysUserJzgInfoBankCardVo.salesman} )
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.typeAttr != null and sysUserJzgInfoBankCardVo.typeAttr != ''">
+                and suji.type_attr = #{sysUserJzgInfoBankCardVo.typeAttr}
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.applyTimeStart != null and sysUserJzgInfoBankCardVo.applyTimeEnd != null">
+                and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.applyTimeStart} AND #{sysUserJzgInfoBankCardVo.applyTimeEnd}
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd != null">
+                and DATE_FORMAT(sujibc.audit_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.auditTimeStart} AND #{sysUserJzgInfoBankCardVo.auditTimeEnd}
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.auditBy != null and sysUserJzgInfoBankCardVo.auditBy != ''">
+                and sujibc.audit_by = #{sysUserJzgInfoBankCardVo.auditBy}
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.auditStatus != null and sysUserJzgInfoBankCardVo.auditStatus != ''">
+                and sujibc.audit_status = #{sysUserJzgInfoBankCardVo.auditStatus}
+            </if>
+            <if test="sysUserJzgInfoBankCardVo.userId != null and sysUserJzgInfoBankCardVo.userId != ''">
+                and su.id = #{sysUserJzgInfoBankCardVo.userId}
+            </if>
+        </where>
         order by
         case when sujibc.is_default = 1 then 0 else 1 end,
         sujibc.create_time desc
     </select>
+
     <!-- 根据银行卡号查询银行卡的信息 lipf 2026年6月8日16:24:13 -->
     <select id="queryBankCardBybankCardNum" resultType="com.jzg.commons.entity.po.SysUserJzgInfoBankCard">
-        select * from sys_user_jzg_info_bank_card sujibc where sujibc.bank_card_number = #{bankCardNum} and sujibc.system_code = #{systemCode}
+        select * from sys_user_jzg_info_bank_card sujibc
+        <where>
+            sujibc.is_delete = 0
+            and sujibc.bank_card_number = #{bankCardNum}
+            and sujibc.system_code = #{systemCode}
+        </where>
     </select>
 </mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -45,15 +45,16 @@
         *
         FROM
         sys_user_jzg_info suji
-        left join sys_user su on su.id = suji.user_id
-        WHERE
-        suji.is_delete = 0
-        <if test="identity != null and identity != ''">
-            AND su.identity = #{identity}
-        </if>
-        <if test="userId != null and userId != ''">
-            AND suji.user_id = #{userId}
-        </if>
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            <if test="identity != null and identity != ''">
+                AND su.identity = #{identity}
+            </if>
+            <if test="userId != null and userId != ''">
+                AND suji.user_id = #{userId}
+            </if>
+        </where>
     </select>
     <!-- 查询业务员 lipf 2026年4月24日11:22:18  -->
     <select id="queryYwy" resultMap="BaseResultMap">
@@ -70,63 +71,58 @@
         suji.is_enable,
         lsu.name AS leader_name,
         ( select  aa.mobile from sys_user aa
-        where aa.id = lsu.user_id ) AS leader_id,
+        where aa.id = lsu.user_id AND aa.is_delete = 0 ) AS leader_id,
         suji.name AS referrer_name,
         su.username as referrer_id,
         suji.create_time AS createTime,
         suji.create_by AS createBy
         from
         sys_user_jzg_info suji
-        left join sys_user su on su.id = suji.user_id
-        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id
-        left join sys_dept sd on sd.id = suji.dept_id
-        -- left join sys_user_role sur on sur.user_id = su.id
-        -- left join sys_organization_user_link soul on soul.user_id = suji.user_id
-        -- join sys_organization so on so.id = soul.organization_id
-        LEFT JOIN sys_dept d ON suji.dept_id = d.id
-        where 1=1
-        and suji.is_delete = 0
-        and suji.id  in (
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id AND lsu.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        LEFT JOIN sys_dept d ON suji.dept_id = d.id AND d.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and suji.id  in (
             select sujis.sys_user_jzg_info_id  from sys_user_jzg_info_salesman sujis  where  sujis.type_attr != 2 AND sujis.type_attr != 3
-        )
-        <if test="leaderId != null and leaderId != ''">
-            and suji.leader_id = #{leaderId}
-        </if>
-        <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
-            and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
-        </if>
-        <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
-            and so.name like concat('%',#{sysUserInfoListVo.deptName},'%')
-        </if>
-        <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
-            and suji.type_attr = #{sysUserInfoListVo.typeAttr}
-        </if>
-        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
-            and suji.status = #{sysUserInfoListVo.status}
-        </if>
-        <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
-            AND suji.status IN
-            <foreach item="status" collection="sysUserInfoListVo.typeStatus"
-                     open="(" separator="," close=")">
-                #{status}
-            </foreach>
-        </if>
-        <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
-            and suji.is_enable = #{sysUserInfoListVo.isEnable}
-        </if>
-        <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
-            and so.id = #{sysUserInfoListVo.sysOrganizationId}
-        </if>
-        <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
-            and (suji.leader_id = #{sysUserInfoListVo.leaderId}
-            or  lsu.name = #{sysUserInfoListVo.leaderId})
-        </if>
-        <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
-            and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
-            or  su.mobile = #{sysUserInfoListVo.salesman}
-            or  suji.work_number = #{sysUserInfoListVo.salesman}
-            or  su.id = #{sysUserInfoListVo.salesman})
-        </if>
+            )
+            <if test="leaderId != null and leaderId != ''">
+                and suji.leader_id = #{leaderId}
+            </if>
+            <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
+                and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
+            </if>
+            <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
+                and suji.type_attr = #{sysUserInfoListVo.typeAttr}
+            </if>
+            <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
+                and suji.status = #{sysUserInfoListVo.status}
+            </if>
+            <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
+                AND suji.status IN
+                <foreach item="status" collection="sysUserInfoListVo.typeStatus"
+                         open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
+                and suji.is_enable = #{sysUserInfoListVo.isEnable}
+            </if>
+            <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
+                and so.id = #{sysUserInfoListVo.sysOrganizationId}
+            </if>
+            <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
+                and (suji.leader_id = #{sysUserInfoListVo.leaderId}
+                or  lsu.name = #{sysUserInfoListVo.leaderId})
+            </if>
+            <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
+                and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
+                or  su.mobile = #{sysUserInfoListVo.salesman}
+                or  suji.work_number = #{sysUserInfoListVo.salesman}
+                or  su.id = #{sysUserInfoListVo.salesman})
+            </if>
+        </where>
         order by suji.create_time desc
     </select>
 
@@ -152,53 +148,49 @@
         suji.create_by as createBy
         from
         sys_user_jzg_info suji
-        left join sys_user su on su.id = suji.user_id
-        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id
-        left join sys_dept sd on sd.id = suji.dept_id
-        -- left join sys_user_role sur on sur.user_id = su.id
-        left join sys_organization_user_link soul on soul.user_id = suji.user_id
-        LEFT JOIN sys_dept d ON suji.dept_id = d.id
-        where
-        1=1
-        and suji.is_delete = 0
-        and suji.id  in (
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id AND lsu.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        left join sys_organization_user_link soul on soul.user_id = suji.user_id AND soul.is_delete = 0
+        LEFT JOIN sys_dept d ON suji.dept_id = d.id AND d.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and suji.id  in (
             select sujis.sys_user_jzg_info_id  from sys_user_jzg_info_salesman sujis  where sujis.type_attr =2
-        )
-        <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
-            and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
-        </if>
-        <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
-            and so.name like concat('%',#{sysUserInfoListVo.deptName},'%')
-        </if>
-        <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
-            and suji.type_attr = #{sysUserInfoListVo.typeAttr}
-        </if>
-        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
-            and suji.status = #{sysUserInfoListVo.status}
-        </if>
-        <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
-            AND suji.status IN
-            <foreach item="status" collection="sysUserInfoListVo.typeStatus"
-                     open="(" separator="," close=")">
-                #{status}
-            </foreach>
-        </if>
-        <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
-            and suji.is_enable = #{sysUserInfoListVo.isEnable}
-        </if>
-        <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
-            and so.id = #{sysUserInfoListVo.sysOrganizationId}
-        </if>
-        <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
-            and (suji.leader_id = #{sysUserInfoListVo.leaderId}
-            or  lsu.name = #{sysUserInfoListVo.leaderId})
-        </if>
-        <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
-            and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
-            or  su.mobile = #{sysUserInfoListVo.salesman}
-            or  suji.work_number = #{sysUserInfoListVo.salesman}
-            or  su.id = #{sysUserInfoListVo.salesman})
-        </if>
+            )
+            <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
+                and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
+            </if>
+            <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
+                and suji.type_attr = #{sysUserInfoListVo.typeAttr}
+            </if>
+            <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
+                and suji.status = #{sysUserInfoListVo.status}
+            </if>
+            <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
+                AND suji.status IN
+                <foreach item="status" collection="sysUserInfoListVo.typeStatus"
+                         open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
+                and suji.is_enable = #{sysUserInfoListVo.isEnable}
+            </if>
+            <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
+                and so.id = #{sysUserInfoListVo.sysOrganizationId}
+            </if>
+            <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
+                and (suji.leader_id = #{sysUserInfoListVo.leaderId}
+                or  lsu.name = #{sysUserInfoListVo.leaderId})
+            </if>
+            <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
+                and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
+                or  su.mobile = #{sysUserInfoListVo.salesman}
+                or  suji.work_number = #{sysUserInfoListVo.salesman}
+                or  su.id = #{sysUserInfoListVo.salesman})
+            </if>
+        </where>
         order by suji.create_time desc
     </select>
     <!-- modify by lipf , 2026年4月14日15:33:13 解决 业务管理-成员管理 页面，管理人和管理人工号不对的问题 -->
@@ -226,204 +218,216 @@
         suji.create_by as createBy
         from
         sys_user_jzg_info suji
-        left join sys_user su on su.id = suji.user_id
-        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id
-        left join sys_dept sd on sd.id = suji.dept_id
+        left join sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        LEFT JOIN sys_user_jzg_info lsu on lsu.id = suji.leader_id AND lsu.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
         left join sys_user_role sur on sur.user_id = su.id
         left join sys_role sr on sr.id = sur.role_id
-        left join sys_organization_user_link soul on soul.user_id = suji.user_id
-        inner join sys_organization so on so.id = soul.organization_id
-        LEFT JOIN sys_dept d ON suji.dept_id = d.id
+        left join sys_organization_user_link soul on soul.user_id = suji.user_id AND soul.is_delete = 0
+        inner join sys_organization so on so.id = soul.organization_id AND so.is_delete = 0
+        LEFT JOIN sys_dept d ON suji.dept_id = d.id AND d.is_delete = 0
         left join sys_user_jzg_info_salesman sujis on sujis.sys_user_jzg_info_id = suji.id
-        where
-        1=1
-        and suji.is_delete = 0
-        <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
-            and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
-        </if>
-        <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
-            and so.name like concat('%',#{sysUserInfoListVo.deptName},'%')
-        </if>
+        <where>
+            suji.is_delete = 0
+            <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
+                and d.route LIKE CONCAT('%', #{sysUserInfoListVo.deptId}, '%')
+            </if>
+            <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
+                and so.name like concat('%',#{sysUserInfoListVo.deptName},'%')
+            </if>
 
-        <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
-            and suji.type_attr = #{sysUserInfoListVo.typeAttr}
-        </if>
-        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
-            and suji.status = #{sysUserInfoListVo.status}
-        </if>
-        <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
-            AND suji.status IN
-            <foreach item="status" collection="sysUserInfoListVo.typeStatus"
-                     open="(" separator="," close=")">
-                #{status}
-            </foreach>
-        </if>
-        <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
-            and suji.is_enable = #{sysUserInfoListVo.isEnable}
-        </if>
-        <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
-            and so.id = #{sysUserInfoListVo.sysOrganizationId}
-        </if>
-        <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
-            and (suji.leader_id = #{sysUserInfoListVo.leaderId}
-            or  lsu.name = #{sysUserInfoListVo.leaderId})
-        </if>
-        <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
-            and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
-            or  su.mobile = #{sysUserInfoListVo.salesman}
-            or  suji.work_number = #{sysUserInfoListVo.salesman}
-            or  su.id = #{sysUserInfoListVo.salesman})
-        </if>
-        <if test="sysUserInfoListVo.isMember!= null and sysUserInfoListVo.isMember!= ''">
-            <if test="sysUserInfoListVo.isMember == 1">
-                and sujis.type_attr = 2
-            </if>
-            <if test="sysUserInfoListVo.isMember == 2">
-                and sujis.type_attr != 2 AND sujis.type_attr != 3
-            </if>
-        </if>
+            <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
+                and suji.type_attr = #{sysUserInfoListVo.typeAttr}
+            </if>
+            <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
+                and suji.status = #{sysUserInfoListVo.status}
+            </if>
+            <if test="sysUserInfoListVo.typeStatus != null and sysUserInfoListVo.typeStatus.size() > 0">
+                AND suji.status IN
+                <foreach item="status" collection="sysUserInfoListVo.typeStatus"
+                         open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
+                and suji.is_enable = #{sysUserInfoListVo.isEnable}
+            </if>
+            <if test="sysUserInfoListVo.sysOrganizationId != null and sysUserInfoListVo.sysOrganizationId != ''">
+                and so.id = #{sysUserInfoListVo.sysOrganizationId}
+            </if>
+            <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
+                and (suji.leader_id = #{sysUserInfoListVo.leaderId}
+                or  lsu.name = #{sysUserInfoListVo.leaderId})
+            </if>
+            <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
+                and (suji.name like concat('%',#{sysUserInfoListVo.salesman},'%')
+                or  su.mobile = #{sysUserInfoListVo.salesman}
+                or  suji.work_number = #{sysUserInfoListVo.salesman}
+                or  su.id = #{sysUserInfoListVo.salesman})
+            </if>
+            <if test="sysUserInfoListVo.isMember!= null and sysUserInfoListVo.isMember!= ''">
+                <if test="sysUserInfoListVo.isMember == 1">
+                    and sujis.type_attr = 2
+                </if>
+                <if test="sysUserInfoListVo.isMember == 2">
+                    and sujis.type_attr != 2 AND sujis.type_attr != 3
+                </if>
+            </if>
+        </where>
         group by suji.id, soul.organization_id, so.name
         order by suji.create_time desc
     </select>
 
     <select id="getUserByMobile" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
         SELECT
-            *
+        *
         FROM
-            sys_user_jzg_info suji
-                LEFT JOIN sys_user su ON suji.user_id = su.id
-        where su.mobile = #{mobile} and suji.is_delete = 0 and su.is_delete = 0
+        sys_user_jzg_info suji
+        LEFT JOIN sys_user su ON suji.user_id = su.id AND su.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and su.mobile = #{mobile}
+        </where>
     </select>
 
     <select id="getTenantList" resultType="com.jzg.commons.entity.user.vo.SysTennatVo">
         SELECT
-            ss.sys_code as system_code,
-            ss.sys_name,
-            sd.name as dept_name,
-            suf.file_name as sys_icon
+        ss.sys_code as system_code,
+        ss.sys_name,
+        sd.name as dept_name,
+        suf.file_name as sys_icon
         FROM
-            sys_user su
-                LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id and suji.is_delete = 0
-                LEFT JOIN sys_system ss ON suji.system_code = ss.sys_code
-                LEFT JOIN sys_dept sd ON sd.id = suji.dept_id
-                LEFT JOIN sys_upload_files suf on suf.id = ss.sys_icon
-        WHERE
-            ( mobile = #{userName} OR username = #{userName})
-        AND suji.system_code != 'APP'
-        AND suji.is_enable = 0
+        sys_user su
+        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_system ss ON suji.system_code = ss.sys_code AND ss.is_delete = 0
+        LEFT JOIN sys_dept sd ON sd.id = suji.dept_id AND sd.is_delete = 0
+        LEFT JOIN sys_upload_files suf on suf.id = ss.sys_icon AND suf.is_delete = 0
+        <where>
+            su.is_delete = 0
+            and ( mobile = #{userName} OR username = #{userName})
+            and suji.system_code != 'APP'
+            and suji.is_enable = 0
+        </where>
     </select>
 
     <select id="getUserJzgInfoByUserId" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
         SELECT
-            *,
-            su.identity,
-            su.identity_time_start,
-            su.identity_time_end,
-            (select GROUP_CONCAT(type_attr SEPARATOR ',' ) from sys_user_jzg_info_salesman where sys_user_jzg_info_id = suji.id) as partnerTypeAttr,
-            IF(EXISTS ( SELECT id FROM sys_user_jzg_info_salesman  WHERE type_attr = 3 AND sys_user_jzg_info_id = suji.id),
-                    (SELECT GROUP_CONCAT(grade SEPARATOR ',' ) FROM partner_user WHERE grade IN (1,2,3,4) and user_id = suji.id), NULL ) AS gradeList
+        *,
+        su.identity,
+        su.identity_time_start,
+        su.identity_time_end,
+        (select GROUP_CONCAT(type_attr SEPARATOR ',' ) from sys_user_jzg_info_salesman where is_delete = 0 and sys_user_jzg_info_id = suji.id) as partnerTypeAttr,
+        IF(EXISTS ( SELECT id FROM sys_user_jzg_info_salesman  WHERE is_delete = 0 and type_attr = 3 AND sys_user_jzg_info_id = suji.id),
+        (SELECT GROUP_CONCAT(grade SEPARATOR ',' ) FROM partner_user WHERE is_delete = 0 and grade IN (1,2,3,4) and user_id = suji.id), NULL ) AS gradeList
         FROM
-            sys_user_jzg_info suji
-                LEFT JOIN sys_user su ON suji.user_id = su.id
-        WHERE
-            user_id = #{userId}
+        sys_user_jzg_info suji
+        LEFT JOIN sys_user su ON suji.user_id = su.id AND su.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and user_id = #{userId}
+        </where>
     </select>
 
     <select id="getUserInfoBySystemCodeAndUserId" resultType="com.jzg.commons.entity.vo.SalesmanVo">
         SELECT
-            suji.name,
-            suji.dept_Id as deptId,
-            suji.leader_id,
-            sd.name as deptName,
-            suji.type_attr as typeAttr,
-            su.mobile as mobile ,
-            suji.dept_id as deptId,
-            so.name as organizationName,
-            so.id as organizationId,
-            suji.system_code as systemCode,
-            ss.sys_name as systemName,
-            ss.short_name as systemShortName
+        suji.name,
+        suji.dept_Id as deptId,
+        suji.leader_id,
+        sd.name as deptName,
+        suji.type_attr as typeAttr,
+        su.mobile as mobile ,
+        suji.dept_id as deptId,
+        so.name as organizationName,
+        so.id as organizationId,
+        suji.system_code as systemCode,
+        ss.sys_name as systemName,
+        ss.short_name as systemShortName
         FROM
-            sys_user_jzg_info suji
-                LEFT JOIN sys_user su ON suji.user_id = su.id
-                left join sys_dept sd on sd.id = suji.dept_id
-                left join sys_organization_user_link soul on soul.user_id = su.id
-                left join sys_organization so on so.id = soul.organization_id
-                left join sys_system ss on ss.sys_code = suji.system_code
-        WHERE
-            suji.user_id = #{userId}
+        sys_user_jzg_info suji
+        LEFT JOIN sys_user su ON suji.user_id = su.id AND su.is_delete = 0
+        left join sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
+        left join sys_organization_user_link soul on soul.user_id = su.id AND soul.is_delete = 0
+        left join sys_organization so on so.id = soul.organization_id AND so.is_delete = 0
+        left join sys_system ss on ss.sys_code = suji.system_code AND ss.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            and suji.user_id = #{userId}
+        </where>
         ORDER BY suji.create_time DESC, so.name desc
         LIMIT 1
     </select>
 
     <select id="selectByUserNameAndMobile" resultType="com.jzg.commons.entity.vo.PartnerRecommenderVo">
         SELECT
-            p.grade,
-            info.id user_id,
-            info.dept_id,
-            info.`name`,
-            u.mobile,
-            ( SELECT GROUP_CONCAT( sa.type_attr SEPARATOR ',' ) FROM sys_user_jzg_info_salesman sa WHERE sa.sys_user_jzg_info_id = p.user_id ) AS typeAttr
+        p.grade,
+        info.id user_id,
+        info.dept_id,
+        info.`name`,
+        u.mobile,
+        ( SELECT GROUP_CONCAT( sa.type_attr SEPARATOR ',' ) FROM sys_user_jzg_info_salesman sa WHERE sa.is_delete = 0 and sa.sys_user_jzg_info_id = p.user_id ) AS typeAttr
         FROM
-            partner_user p
-                LEFT JOIN sys_user_jzg_info info ON info.id = p.user_id
-                LEFT JOIN sys_user u ON u.id = info.user_id
-        WHERE
+        partner_user p
+        LEFT JOIN sys_user_jzg_info info ON info.id = p.user_id AND info.is_delete = 0
+        LEFT JOIN sys_user u ON u.id = info.user_id AND u.is_delete = 0
+        <where>
             p.grade = #{grade}
+        </where>
         GROUP BY
-            p.grade,
-            info.`name`,
-            u.mobile,
-            info.dept_id,
-            p.user_id
+        p.grade,
+        info.`name`,
+        u.mobile,
+        info.dept_id,
+        p.user_id
     </select>
 
     <select id="selectPartnerReviewVo" resultType="com.jzg.commons.entity.vo.PartnerReviewVo">
         SELECT
-            info.id userInfoId,
-            info.`name`,
-            info.dept_id,
-            info.create_time,
-            info.leader_id,
-            info.referrer_id,
-            u.mobile,
-            d.`name` deptName,
-            referrer.`name` AS referrerName,
-            leader.`name` AS leaderIdName,
-            sa.partner_review_time,
-            pa.`name` partner_reviewer,
-            pu.gradeList
+        info.id userInfoId,
+        info.`name`,
+        info.dept_id,
+        info.create_time,
+        info.leader_id,
+        info.referrer_id,
+        u.mobile,
+        d.`name` deptName,
+        referrer.`name` AS referrerName,
+        leader.`name` AS leaderIdName,
+        sa.partner_review_time,
+        pa.`name` partner_reviewer,
+        pu.gradeList
         FROM
-            sys_user_jzg_info info
-                LEFT JOIN sys_user u ON u.id = info.user_id
-                LEFT JOIN sys_dept d ON d.id = info.dept_id
-                LEFT JOIN sys_user_jzg_info referrer ON referrer.id = info.referrer_id
-                LEFT JOIN sys_user_jzg_info leader ON leader.id = info.leader_id
-                LEFT JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id
-                LEFT JOIN sys_user_jzg_info pa ON pa.user_id = sa.partner_reviewer
-                LEFT JOIN (SELECT user_id, GROUP_CONCAT(grade SEPARATOR ',') AS gradeList FROM partner_user GROUP BY user_id ) pu ON pu.user_id = info.id
-        WHERE
-            sa.type_attr = 3
-          AND sa.partner_status = #{partnerReviewParam.partnerStatus}
-        <if test="partnerReviewParam.name !='' and partnerReviewParam.name != null">
-            AND info.`name` like concat('%',#{partnerReviewParam.name},'%')
-        </if>
-        <if test="partnerReviewParam.leaderId !='' and partnerReviewParam.leaderId != null">
-            AND leader.`name` like concat('%',#{partnerReviewParam.leaderId},'%')
-        </if>
-        <if test="partnerReviewParam.deptId !='' and partnerReviewParam.deptId != null">
-            AND info.`dept_id` = #{partnerReviewParam.deptId}
-        </if>
-        <if test="partnerReviewParam.grade !='' and partnerReviewParam.grade != null">
-            AND FIND_IN_SET(#{partnerReviewParam.grade}, pu.gradeList)
-        </if>
+        sys_user_jzg_info info
+        LEFT JOIN sys_user u ON u.id = info.user_id AND u.is_delete = 0
+        LEFT JOIN sys_dept d ON d.id = info.dept_id AND d.is_delete = 0
+        LEFT JOIN sys_user_jzg_info referrer ON referrer.id = info.referrer_id AND referrer.is_delete = 0
+        LEFT JOIN sys_user_jzg_info leader ON leader.id = info.leader_id AND leader.is_delete = 0
+        LEFT JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id and sa.is_delete = 0
+        LEFT JOIN sys_user_jzg_info pa ON pa.user_id = sa.partner_reviewer AND pa.is_delete = 0
+        LEFT JOIN (SELECT user_id, GROUP_CONCAT(grade SEPARATOR ',') AS gradeList FROM partner_user pu where pu.is_delete = 0 GROUP BY user_id ) pu ON pu.user_id = info.id
+        <where>
+            info.is_delete = 0
+            and sa.type_attr = 3
+            AND sa.partner_status = #{partnerReviewParam.partnerStatus}
+            <if test="partnerReviewParam.name !='' and partnerReviewParam.name != null">
+                AND info.`name` like concat('%',#{partnerReviewParam.name},'%')
+            </if>
+            <if test="partnerReviewParam.leaderId !='' and partnerReviewParam.leaderId != null">
+                AND leader.`name` like concat('%',#{partnerReviewParam.leaderId},'%')
+            </if>
+            <if test="partnerReviewParam.deptId !='' and partnerReviewParam.deptId != null">
+                AND info.`dept_id` = #{partnerReviewParam.deptId}
+            </if>
+            <if test="partnerReviewParam.grade !='' and partnerReviewParam.grade != null">
+                AND FIND_IN_SET(#{partnerReviewParam.grade}, pu.gradeList)
+            </if>
+        </where>
     </select>
 
     <select id="isPartnerPresent" resultType="java.lang.Boolean">
         SELECT
             IF(COUNT(*) > 0, 1, 0)
         FROM sys_user_jzg_info_salesman
-        WHERE type_attr = 3
+        WHERE type_attr = 3 and is_delete = 0
           AND sys_user_jzg_info_id = #{id};
     </select>
 
@@ -431,40 +435,47 @@
         SELECT
             IF(COUNT(*) > 0, 1, 0)
         FROM sys_user_jzg_info_salesman
-        WHERE type_attr = 6
+        WHERE type_attr = 6 and is_delete = 0
           AND sys_user_jzg_info_id = #{id};
     </select>
 
     <select id="selectByUserIdInfo" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
         SELECT info.*
         FROM sys_user_jzg_info info
-                 INNER JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id
-        WHERE sa.type_attr = 3 AND info.user_id = #{userId}
+        INNER JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id AND sa.is_delete = 0
+        <where>
+            info.is_delete = 0
+            and sa.type_attr = 3
+            and info.user_id = #{userId}
+        </where>
     </select>
 
     <select id="selectTypeAttrs" resultType="java.lang.String">
         SELECT
-            sjis.type_attr
+        sjis.type_attr
         FROM
-            sys_user_jzg_info_salesman sjis
-                INNER JOIN sys_user_jzg_info suji ON sjis.sys_user_jzg_info_id = suji.id
-        WHERE
+        sys_user_jzg_info_salesman sjis
+        INNER JOIN sys_user_jzg_info suji ON sjis.sys_user_jzg_info_id = suji.id AND suji.is_delete = 0
+        <where>
             suji.user_id = #{userId}
-          AND suji.is_delete = 0
-          AND suji.is_enable = 0
-          AND sjis.sys_user_jzg_info_id IS NOT NULL
+            AND suji.is_delete = 0
+            AND suji.is_enable = 0
+            AND sjis.sys_user_jzg_info_id IS NOT NULL
+        </where>
     </select>
 
     <select id="getPartUserInfoByMobile" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
         SELECT DISTINCT info.id
         FROM sys_user_jzg_info info
-                 INNER JOIN partner_user p ON p.user_id = info.id
-                 INNER JOIN sys_user u ON u.id = info.user_id
-                 INNER JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id
-        WHERE
-            p.grade > 4
-          AND u.mobile = #{mobile}
-          AND sa.type_attr = 3
+        INNER JOIN partner_user p ON p.user_id = info.id
+        INNER JOIN sys_user u ON u.id = info.user_id AND u.is_delete = 0
+        INNER JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id AND sa.is_delete = 0
+        <where>
+            info.is_delete = 0
+            AND p.grade > 4
+            AND u.mobile = #{mobile}
+            AND sa.type_attr = 3
+        </where>
     </select>
 
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoSalesmanMapper.xml

@@ -6,15 +6,17 @@
     <select id="queryYwyTypeAttrInfo" resultType="com.jzg.commons.entity.po.SysUserJzgInfoSalesmanBO">
         select
         su.username,
-        suji.system_code ,
+        suji.system_code,
         sujis.*
         from
         sys_user_jzg_info_salesman sujis
-        left join sys_user_jzg_info suji on
-        sujis.sys_user_jzg_info_id = suji.id
-        left join sys_user su on
-        suji.user_id = su.id
-        where su.username  is not null
-        and suji.system_code  = #{systemCode}
+        left join sys_user_jzg_info suji on sujis.sys_user_jzg_info_id = suji.id AND suji.is_delete = 0
+        left join sys_user su on suji.user_id = su.id AND su.is_delete = 0
+        <where>
+            sujis.is_delete = 0
+            and su.username is not null
+            and suji.system_code = #{systemCode}
+        </where>
+        ORDER BY sujis.id DESC
     </select>
 </mapper>

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -4,18 +4,19 @@
 
     <select id="getUserInfo" resultType="com.jzg.commons.entity.vo.SysUserVo">
         SELECT
-            *
+        *
         FROM
-            sys_user su
-        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
-        WHERE
-            1=1
-        <if test="param.id != null and param.id != ''">
-            AND su.id = #{param.id}
-        </if>
-        <if test="param.deptId != null and param.deptId != ''">
-            AND suji.dept_id = #{param.deptId}
-        </if>
+        sys_user su
+        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id AND suji.is_delete = 0
+        <where>
+            su.is_delete = 0
+            <if test="param.id != null and param.id != ''">
+                AND su.id = #{param.id}
+            </if>
+            <if test="param.deptId != null and param.deptId != ''">
+                AND suji.dept_id = #{param.deptId}
+            </if>
+        </where>
     </select>
 
     <select id="getUserSelect" resultType="com.jzg.commons.entity.vo.SysUserSelectVo">
@@ -28,24 +29,28 @@
         suji.work_number
         FROM
         sys_user_jzg_info suji
-        inner join sys_user su on su.id = suji.user_id
-        WHERE
-        suji.is_delete = 0
-        <if test="param.deptId!= null and param.deptId!= ''">
-            AND suji.dept_id = #{param.deptId}
-        </if>
-        <if test="param.typeAttr != null and param.typeAttr != ''">
-        and suji.id in (
-                select sujis.sys_user_jzg_info_id  from sys_user_jzg_info_salesman sujis where sujis.type_attr  = #{param.typeAttr}
+        inner join sys_user su on su.id = suji.user_id AND su.is_delete = 0
+        <where>
+            suji.is_delete = 0
+            <if test="param.deptId!= null and param.deptId!= ''">
+                AND suji.dept_id = #{param.deptId}
+            </if>
+            <if test="param.typeAttr != null and param.typeAttr != ''">
+                and suji.id in (
+                select sujis.sys_user_jzg_info_id
+                from sys_user_jzg_info_salesman sujis
+                where sujis.type_attr = #{param.typeAttr}
+                and sujis.is_delete = 0
+                )
+            </if>
+            <if test="param.name!= null and param.name!= ''">
+                AND (
+                suji.name LIKE CONCAT('%', #{param.name}, '%')
+                OR su.mobile LIKE CONCAT('%', #{param.name}, '%')
+                OR suji.work_number LIKE CONCAT('%', #{param.name}, '%')
                 )
-        </if>
-        <if test="param.name!= null and param.name!= ''">
-            AND (
-            suji.name LIKE CONCAT('%', #{param.name}, '%')
-            OR su.mobile LIKE CONCAT('%', #{param.name}, '%')
-            OR suji.work_number LIKE CONCAT('%', #{param.name}, '%')
-            )
-        </if>
+            </if>
+        </where>
     </select>
 
     <select id="getUserByMobile" resultType="com.jzg.commons.entity.po.SysUser">
@@ -53,31 +58,33 @@
         *
         FROM
         sys_user su
-        WHERE
-        1=1
-        and su.is_delete = 0
-        <if test="mobile != null and mobile != ''">
-            AND su.mobile = #{mobile}
-        </if>
+        <where>
+            su.is_delete = 0
+            <if test="mobile != null and mobile != ''">
+                AND su.mobile = #{mobile}
+            </if>
+        </where>
     </select>
 
     <select id="getUserRoleName" resultType="String">
-        SELECT NAME AS
-                   role_name
+        SELECT sr.NAME AS role_name
         FROM
-            sys_user_role sur
-                LEFT JOIN sys_role sr ON sur.role_id = sr.id
-        WHERE
+        sys_user_role sur
+        LEFT JOIN sys_role sr ON sur.role_id = sr.id AND sr.is_delete = 0
+        <where>
             sur.user_id = #{userId}
+            and sur.is_delete = 0
+        </where>
     </select>
+
     <select id="getUserByDeptId" resultType="com.jzg.commons.entity.vo.AgreementUserVo">
         SELECT suji.id, suji.user_id as userId, suji.name, su.mobile, suji.dept_id as deptId, sd.name as deptName
         FROM sys_user_jzg_info suji
-        LEFT JOIN sys_user su on suji.user_id = su.id
-        LEFT JOIN sys_dept sd on sd.id = suji.dept_id
+        LEFT JOIN sys_user su on suji.user_id = su.id AND su.is_delete = 0
+        LEFT JOIN sys_dept sd on sd.id = suji.dept_id AND sd.is_delete = 0
         <where>
-            1=1
-            and suji.is_delete = 0 and suji.type_attr = 2
+            suji.is_delete = 0
+            and suji.type_attr = 2
             <if test="deptId != null and deptId != ''">
                 AND suji.dept_id = #{deptId}
             </if>
@@ -88,4 +95,4 @@
         group by suji.id
         order by suji.create_time desc
     </select>
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -4,18 +4,22 @@
 
     <select id="getUserRole" resultType="com.jzg.commons.entity.po.SysRole">
         SELECT
-            sr.*
+        sr.*
         FROM
-            sys_user_role sur
-                INNER JOIN sys_role sr ON sur.role_id = sr.id
-        WHERE user_id = #{userId}
+        sys_user_role sur
+        INNER JOIN sys_role sr ON sur.role_id = sr.id AND sr.is_delete = 0
+        <where>
+            sur.is_delete = 0
+            AND user_id = #{userId}
+        </where>
     </select>
 
-    <delete id="deleteByUserId">
-        DELETE FROM sys_user_role WHERE user_id = #{userId}
-        AND role_id IN
-        <foreach collection="roleIds" item="roleId" open="(" close=")" separator=",">
-            #{roleId}
-        </foreach>
-    </delete>
-</mapper>
+<!--    <delete id="deleteByUserId">-->
+<!--        DELETE FROM sys_user_role-->
+<!--        WHERE user_id = #{userId}-->
+<!--        AND role_id IN-->
+<!--        <foreach collection="roleIds" item="roleId" open="(" close=")" separator=",">-->
+<!--            #{roleId}-->
+<!--        </foreach>-->
+<!--    </delete>-->
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserSignInMapper.xml

@@ -4,35 +4,43 @@
 
     <select id="selectLatestByUser" resultType="com.jzg.commons.entity.po.SysUserSignIn">
         SELECT * FROM sys_user_sign_in
-        WHERE system_code = #{tenantId}
-          AND user_id = #{userId}
-          AND is_delete = 0
+        <where>
+            system_code = #{tenantId}
+            AND user_id = #{userId}
+            AND is_delete = 0
+        </where>
         ORDER BY sign_in_date DESC
         LIMIT 1
     </select>
 
     <select id="countByDate" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM sys_user_sign_in
-        WHERE system_code = #{tenantId}
-          AND user_id = #{userId}
-          AND sign_in_date = #{signInDate}
-          AND is_delete = 0
+        <where>
+            system_code = #{tenantId}
+            AND user_id = #{userId}
+            AND sign_in_date = #{signInDate}
+            AND is_delete = 0
+        </where>
     </select>
 
     <select id="selectListByUser" resultType="com.jzg.commons.entity.po.SysUserSignIn">
         SELECT * FROM sys_user_sign_in
-        WHERE system_code = #{tenantId}
-          AND user_id = #{userId}
-          AND sign_in_date BETWEEN #{startDate} AND #{endDate}
-          AND is_delete = 0
+        <where>
+            system_code = #{tenantId}
+            AND user_id = #{userId}
+            AND sign_in_date BETWEEN #{startDate} AND #{endDate}
+            AND is_delete = 0
+        </where>
         ORDER BY sign_in_date DESC
     </select>
 
     <select id="selectMaxContinuousDays" resultType="java.lang.Integer">
         SELECT MAX(continuous_days) FROM sys_user_sign_in
-        WHERE system_code = #{tenantId}
-          AND user_id = #{userId}
-          AND is_delete = 0
+        <where>
+            system_code = #{tenantId}
+            AND user_id = #{userId}
+            AND is_delete = 0
+        </where>
     </select>
 
-</mapper>
+</mapper>

tenant/organization/src/main/resources/mapper/SysVersionMapper.xml

@@ -4,10 +4,13 @@
 
     <select id="getMaxVersion" resultType="string">
         SELECT
-            max(sv.version)
+        max(sv.version)
         FROM
-            sys_version sv
-        WHERE sv.app_id = #{appId}
+        sys_version sv
+        <where>
+            sv.is_delete = 0
+            AND sv.app_id = #{appId}
+        </where>
     </select>
 
     <select id="getSysVersionPageList" resultType="com.jzg.commons.entity.po.SysVersion">
@@ -15,17 +18,18 @@
         sv.*
         from
         sys_version sv
-        where
-        1=1
-        <if test="sysVersionVo.appName != null and sysVersionVo.appName != ''">
-            and sv.appname = #{sysVersionVo.appName}
-        </if>
-        <if test="sysVersionVo.packageType != null and sysVersionVo.packageType != ''">
-            and sv.package_type = #{sysVersionVo.packageType}
-        </if>
-        <if test="sysVersionVo.appId != null and sysVersionVo.appId != ''">
-            and sv.appid = #{sysVersionVo.appId}
-        </if>
+        <where>
+            sv.is_delete = 0
+            <if test="sysVersionVo.appName != null and sysVersionVo.appName != ''">
+                and sv.appname = #{sysVersionVo.appName}
+            </if>
+            <if test="sysVersionVo.packageType != null and sysVersionVo.packageType != ''">
+                and sv.package_type = #{sysVersionVo.packageType}
+            </if>
+            <if test="sysVersionVo.appId != null and sysVersionVo.appId != ''">
+                and sv.appid = #{sysVersionVo.appId}
+            </if>
+        </where>
         order by sv.create_time desc
     </select>
 

tenant/organization/src/main/resources/mapper/WechatCustomerServiceMapper.xml

@@ -15,11 +15,12 @@
         MAX(wcs.create_time) AS createTime,
         MAX(IF(wcsd.id IS NOT NULL, TRUE, FALSE)) AS isScheduling
         FROM wechat_customer_service wcs
-        LEFT JOIN sys_user su ON wcs.user_id = su.id
-        LEFT JOIN sys_upload_files suf ON wcs.avatar = suf.id
+        LEFT JOIN sys_user su ON wcs.user_id = su.id AND su.is_delete = 0
+        LEFT JOIN sys_upload_files suf ON wcs.avatar = suf.id AND suf.is_delete = 0
         LEFT JOIN wechat_customer_service_duty wcsd
-        ON wcs.id = wcsd.customer_service_id
+        ON wcs.id = wcsd.customer_service_id AND wcsd.is_delete = 0
         <where>
+            wcs.is_delete = 0
             <if test="sysWechatCustomerQuery.nickname != null and sysWechatCustomerQuery.nickname != ''">
                 and wcs.nickname like concat('%', #{sysWechatCustomerQuery.nickname}, '%')
             </if>
@@ -27,4 +28,4 @@
         GROUP BY wcs.id
     </select>
 
-</mapper>
+</mapper>