From bd90f9f71361f50d2de0d7ce3353af17615f7df7 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Mon, 7 Aug 2023 18:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/controller/BmsSupplierController.java | 23 +++++++++++++++++++
 .../serve/modules/bms/entity/BmsSupplier.java |  2 +-
 .../mapper/bms/BmsSupplierMapper.xml          | 22 ++++++++++++++----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
index 35de90d7..fd1f127e 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
@@ -119,6 +119,29 @@ public class BmsSupplierController {
             PageUtil.setPageNum(param.getPageNum()+"");
             return supplierMyController.getUnderlingAndMinePage(param);
         }
+        if(StringUtils.hasText(param.getRegion2Label())){
+            LambdaQueryWrapper<BmsRegion2> region2LambdaQueryWrapper = new LambdaQueryWrapper<>();
+            region2LambdaQueryWrapper.like(BmsRegion2::getPathNames,param.getRegion2Label());
+            List<BmsRegion2> region2List = bmsRegion2Service.list(region2LambdaQueryWrapper);
+            if(region2List.size()>0) {
+                param.setRegion2Ids(region2List.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+
+        if(StringUtils.hasText(param.getRegionLabel())){
+            LambdaQueryWrapper<BmsRegion> regionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            regionLambdaQueryWrapper.like(BmsRegion::getPathNames,param.getRegionLabel());
+            List<BmsRegion> regionList = bmsRegionService.list(regionLambdaQueryWrapper);
+            if(regionList.size()>0) {
+                param.setRegionIds(regionList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+            }else{
+                param.setRegion2Ids(Arrays.asList("#"));
+            }
+        }
+
+
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
         initSupplierList(list);
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index cd914c11..fe2e58d1 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
@@ -166,7 +166,7 @@ public class BmsSupplier implements Serializable {
 
     /** 多选：行政区域ID */
     @TableField(exist = false)
-    private String[] region2Ids;
+    private List<String> region2Ids;
 
     /** 销售区域 */
     @TableField(exist = false)
diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
index 60c46f82..ab948210 100644
--- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml
+++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
@@ -87,7 +87,7 @@
             <if test="query.pid != null"> and `bms_supplier`.`pid` = #{query.pid}</if>
             <if test="query.parentCode != null and query.parentCode != ''"> and `bms_supplier`.`parent_code` = #{query.parentCode}</if>
             <if test="query.stopFlag != null"> and `bms_supplier`.`stop_flag` = #{query.stopFlag}</if>
-            <if test="query.belong != null"> and `bms_supplier`.`belong` = #{query.belong}</if>
+            <if test="query.belong != null and query.belong != ''"> and `bms_supplier`.`belong` = #{query.belong}</if>
             <if test="query.createTime != null"> and `bms_supplier`.`create_time` = #{query.createTime}</if>
             <if test="query.createBy != null and query.createBy != ''"> and `bms_supplier`.`create_by` = #{query.createBy}</if>
             <if test="query.updateTime != null"> and `bms_supplier`.`update_time` = #{query.updateTime}</if>
@@ -111,10 +111,22 @@
                     #{selectId}
                 </foreach>
             </if>
-            <if test='query.isRegionNull != null and query.isRegionNull == "1"'>
-                and (`bms_supplier`.`region_last` is null  or  TRIM(`bms_supplier`.`region_last`) = ''
-                 or `bms_supplier`.`region2_last` is null  or  TRIM(`bms_supplier`.`region2_last`) = ''
-                 )
+            <if test="query.region2Ids!=null and query.region2Ids.size > 0">
+                and bms_supplier.region2_last in
+                <foreach collection="query.region2Ids" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
+            <if test='query.isRegionNull != null '>
+                <if test=' query.isRegionNull == "1"'>
+                    and (`bms_supplier`.`region_last` is null  or  TRIM(`bms_supplier`.`region_last`) = ''
+                    or `bms_supplier`.`region2_last` is null  or  TRIM(`bms_supplier`.`region2_last`) = ''
+                    )
+                </if>
+                <if test=' query.isRegionNull != "1"'>
+                    and `bms_supplier`.`region_last` is not null and `bms_supplier`.`region2_last` is not null
+                    and TRIM(`bms_supplier`.`region_last`) != '' and TRIM(`bms_supplier`.`region2_last`) != ''
+                </if>
             </if>
         </where>
         ORDER BY `bms_supplier`.`update_time` DESC