修改产品列表查询及师傅列表查询

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();

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;

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;

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>

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;

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}