From 77e60de9efddb95273b56064b4b0cd63e0e6bb4e Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 4 Aug 2022 23:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E7=9B=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=B8=88=E5=82=85=E5=88=97=E8=A1=A8=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/goods/GoodsController.java   | 13 +++++++++++++
 .../ghy/web/controller/worker/WorkerController.java | 13 +++++++++++++
 .../src/main/resources/mapper/goods/GoodsMapper.xml |  1 +
 .../mapper/worker/WorkerGoodsCategoryMapper.xml     |  1 +
 4 files changed, 28 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
index 4f485ac8..6e9ea8ab 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
@@ -75,6 +75,19 @@ public class GoodsController extends BaseController {
             if (goodsCategory.getLevel() == 0) {
                 goods.setDeptGoodsCategoryId(null);
             } else if (goodsCategory.getLevel() == 1) {
+                GoodsCategory params = new GoodsCategory();
+                params.setParentCategoryId(goodsCategory.getGoodsCategoryId());
+                List<GoodsCategory> secondCategories = goodsCategoryService.selectGoodsCategoryList(params);
+                List<Long> secondCategoryIds = secondCategories.stream().map(GoodsCategory::getGoodsCategoryId).collect(Collectors.toList());
+                List<Long> thirdCategoryIds = new ArrayList<Long>();
+                secondCategoryIds.forEach(id -> {
+                    params.setParentCategoryId(id);
+                    List<GoodsCategory> thirdCategories = goodsCategoryService.selectGoodsCategoryList(params);
+                    thirdCategoryIds.addAll(thirdCategories.stream().map(GoodsCategory::getGoodsCategoryId).collect(Collectors.toList()));
+                });
+                goods.setDeptGoodsCategoryId(null);
+                goods.setDeptGoodsCategoryIds(thirdCategoryIds);
+            } else if (goodsCategory.getLevel() == 2) {
                 GoodsCategory params = new GoodsCategory();
                 params.setParentCategoryId(goodsCategory.getGoodsCategoryId());
                 List<GoodsCategory> filteredCategory = goodsCategoryService.selectGoodsCategoryList(params);
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 43537cd2..7fdc38a1 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
@@ -139,6 +139,19 @@ public class WorkerController extends BaseController {
                 if (goodsCategory.getLevel() == 0) {
                     workerGoodsCategory.setGoodsCategoryId(null);
                 } else if (goodsCategory.getLevel() == 1) {
+                    GoodsCategory params = new GoodsCategory();
+                    params.setParentCategoryId(goodsCategory.getGoodsCategoryId());
+                    List<GoodsCategory> secondCategories = goodsCategoryService.selectGoodsCategoryList(params);
+                    List<Long> secondCategoryIds = secondCategories.stream().map(GoodsCategory::getGoodsCategoryId).collect(Collectors.toList());
+                    List<Long> thirdCategoryIds = new ArrayList<Long>();
+                    secondCategoryIds.forEach(id -> {
+                        params.setParentCategoryId(id);
+                        List<GoodsCategory> thirdCategories = goodsCategoryService.selectGoodsCategoryList(params);
+                        thirdCategoryIds.addAll(thirdCategories.stream().map(GoodsCategory::getGoodsCategoryId).collect(Collectors.toList()));
+                    });
+                    workerGoodsCategory.setGoodsCategoryId(null);
+                    workerGoodsCategory.setGoodsCategoryIds(thirdCategoryIds);
+                } else if (goodsCategory.getLevel() == 2) {
                     GoodsCategory params = new GoodsCategory();
                     params.setParentCategoryId(goodsCategory.getGoodsCategoryId());
                     List<GoodsCategory> filteredCategory = goodsCategoryService.selectGoodsCategoryList(params);
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 6756ab55..0f088eaf 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -101,6 +101,7 @@
                 AND dept_goods_category_id = #{deptGoodsCategoryId}
             </if>
             <if test="deptGoodsCategoryIds != null">
+                AND dept_goods_category_id in
                 <foreach collection="deptGoodsCategoryIds" item="deptGoodsCategoryId" open="(" separator="," close=")">
                     #{deptGoodsCategoryId}
                 </foreach>
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml
index 138dbc49..44db3292 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerGoodsCategoryMapper.xml
@@ -57,6 +57,7 @@
                 AND wgc.goods_category_id = #{goodsCategoryId}
             </if>
             <if test="goodsCategoryIds != null">
+                AND wgc.goods_category_id in
                 <foreach collection="goodsCategoryIds" item="goodsCategoryId" open="(" separator="," close=")">
                     #{goodsCategoryId}
                 </foreach>