供应商

src/main/java/com/dk/mdm/mapper/mac/OtherPayableMapper.xml

@@ -102,6 +102,10 @@
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
+            <if test="searchText !=null">
+                AND (t.payable_no  LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or   supplier.sup_name LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mac/OtherReceivableMapper.xml

@@ -105,6 +105,10 @@
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
+            <if test="searchText !=null">
+                AND ( t.receivable_no  LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or   tmc.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -128,8 +128,12 @@
             <if test="parentId != null and parentId != ''">
                 AND parent.parent_id = #{parentId}::uuid
             </if>
+            <if test="filterFlag != null and filterFlag != ''">
+                AND  level_code NOT LIKE concat(#{levelCode}, '%')
+            </if>
+
             <if test="searchText !=null">
-                AND parent.org_name LIKE concat('%', #{searchText}, '%')
+                AND   parent.org_name LIKE concat('%',my_ex.likequery(#{searchText}), '%')
             </if>
             <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
                 limit #{end} offset #{start}

src/main/java/com/dk/mdm/model/query/mst/OrgQuery.java

@@ -45,6 +45,7 @@ public class OrgQuery extends PageInfo<com.dk.mdm.model.query.mst.OrgQuery> impl
     @TableId(value = "org_id", type = IdType.AUTO)
     @ApiModelProperty(value = "组织ID")
     private String orgId;
+    private String filterFlag;
 
     private String searchText;
     /**
@@ -53,6 +54,12 @@ public class OrgQuery extends PageInfo<com.dk.mdm.model.query.mst.OrgQuery> impl
     @Excel(name = "组织代码")
     @ApiModelProperty(value = "组织代码")
     private String orgCode;
+    /**
+     * 层级代码
+     */
+    @Excel(name = "层级代码")
+    @ApiModelProperty(value = "层级代码")
+    private String levelCode;
 
 
     /**

src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -96,6 +96,11 @@ public class OrgService extends BaseService<Org> {
      */
     @Pagination
     public ResponseResultVO<List<OrgResponse>>  selectChooseOrg( OrgQuery orgQuery) {
+        if(orgQuery.getOrgId()!=null){
+            Org org =   orgMapper.selectById(orgQuery.getOrgId()); //查出上级部门的 层级代码
+            orgQuery.setLevelCode(org.getLevelCode());
+            orgQuery.setFilterFlag("ok");
+        }
         return ResponseResultUtil.success(orgMapper.selectChooseOrg(orgQuery));
     }
     /**

src/main/java/com/dk/mdm/service/mst/SupplierService.java

@@ -115,8 +115,8 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
         try {
           super.updateByUuid(supplier);// 先更新的供应商表
-          supplierMapper.batchDeleteBrand(supplier.getBrandIds());//批量删除供应商对应的供应商品牌
             if ((supplier.getBrandIds() != null) && (supplier.getBrandIds().size()>0)) {  //如果有 商品品牌 一起插入品牌
+                supplierMapper.batchDeleteBrand(supplier.getBrandIds());//批量删除供应商对应的供应商品牌
                 List<Supplier>  Supplierlst   = new ArrayList<>();
                 List<String> BrandIdList =  new ArrayList<>();
                 BrandIdList = supplier.getBrandIds();