From 07350aa6d52b9cb77fea8aec647548f2b2bef349 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 31 Dec 2022 20:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8F=8A=E5=B8=88=E5=82=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/worker/WorkerController.java   | 1 +
 .../main/java/com/ghy/web/pojo/vo/WorkerListRequest.java  | 4 ++++
 ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java   | 2 ++
 ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 6 ++++++
 .../src/main/java/com/ghy/worker/domain/Worker.java       | 2 ++
 .../src/main/resources/mapper/worker/WorkerMapper.xml     | 8 +++++++-
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index b72c028d..6a36c879 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -181,6 +181,7 @@ public class WorkerController extends BaseController {
         try {
             // 查询满足区域条件的师傅区域记录
             worker.setDistrictId(workerListRequest.getAreaId());
+            worker.setDistrictIds(workerListRequest.getAreaIds());
             // 查询需要排除的区
             if (workerListRequest.getExceptParentAreaId() != null) {
                 SysArea areaParams = new SysArea();
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java
index ce975525..eab56087 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java
@@ -3,6 +3,8 @@ package com.ghy.web.pojo.vo;
 import com.ghy.worker.domain.Worker;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author ydq
  * @date : 2022-06-24 17:38
@@ -11,6 +13,8 @@ import lombok.Data;
 public class WorkerListRequest {
     private Long areaId;
 
+    private List<Long> areaIds;
+
     private Long goodsCategoryId;
 
     private String workerName;
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index 640a6a22..deb83bc9 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -63,6 +63,8 @@ public class Goods extends BaseEntity {
     @Excel(name = "区域Id", cellType = Excel.ColumnType.NUMERIC)
     private Long areaId;
 
+    private List<Long> areaIds;
+
     private Long exceptParentAreaId;
 
     private List<GoodsArea> goodsAreaList;
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 5fcbf990..5f1bcc28 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -110,6 +110,12 @@
             <if test="areaId != null and areaId != ''">
                 AND country_area_id = #{areaId}
             </if>
+            <if test="areaIds != null and areaIds.size > 0">
+                AND country_area_id in
+                <foreach collection="areaIds" item="areaId" open="(" separator="," close=")">
+                    #{areaId}
+                </foreach>
+            </if>
             <if test="exceptParentAreaId != null">
                 AND sa.parent_code != #{exceptParentAreaId}
             </if>
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index 4778da49..61c3489d 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -66,6 +66,8 @@ public class Worker extends BaseEntity {
 
     private Long districtId;
 
+    private List<Long> districtIds;
+
     private List<Long> exceptDistrictIds;
 
     private Long goodsCategoryId;
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index 1b33c4af..181c77b2 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -61,7 +61,13 @@
                 <if test="districtId != null">
                     AND wa.district_id = #{districtId}
                 </if>
-                <if test="exceptDistrictIds != null">
+                <if test="districtIds != null and districtIds.size > 0">
+                    AND wa.district_id in
+                    <foreach collection="districtIds" item="districtId" open="(" separator="," close=")">
+                        #{districtId}
+                    </foreach>
+                </if>
+                <if test="exceptDistrictIds != null and exceptDistrictIds.size > 0">
                     AND wa.district_id not in
                     <foreach collection="exceptDistrictIds" item="exceptDistrictId" open="(" separator="," close=")">
                         #{exceptDistrictId}