From d1860dcb54b07a35efe2af32ee5d917f07340be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E7=A6=8F=E6=B3=A2?=
 <14587188+cui-fubo@user.noreply.gitee.com>
Date: Sat, 16 Nov 2024 11:02:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8A=8A=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=BA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/product/domain/resp/RuleInfoResp.java  |  1 +
 .../product/controller/CategoryInfoController.java  |  9 +++++++++
 .../product/service/impl/RuleInfoServiceImpl.java   | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java
index 8596383..664e832 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java
@@ -37,6 +37,7 @@ public class RuleInfoResp extends BaseEntity {
      */
     private List<RuleAttrAddModel> ruleAttrList;
 
+    private boolean flag;
     public static RuleInfoResp infoBuild (RuleInfo ruleInfo, Function<Long, List<RuleAttrAddModel>> ruleAttrList) {
         return RuleInfoResp.builder()
                 .id(ruleInfo.getId())
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java
index 70e4a93..dfa0f59 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java
@@ -1,6 +1,7 @@
 package com.muyu.product.controller;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Supplier;
 import javax.servlet.http.HttpServletResponse;
 
@@ -54,6 +55,14 @@ public class CategoryInfoController extends BaseController {
     @GetMapping("/list")
     public Result<List<CategoryInfo>> list(CategoryInfo categoryInfo) {
         List<CategoryInfo> list = categoryInfoService.list(categoryInfo);
+        List<CategoryInfo> infos = list.stream().filter(cateryInfoParent -> cateryInfoParent.getParentId() != 0).toList();
+        for (CategoryInfo info : infos) {
+            for (CategoryInfo categoryInfo1 : list) {
+                if(Objects.equals(info.getParentId(),categoryInfo1.getId())){
+                    info.setParentName(categoryInfo1.getName());
+                }
+            }
+        }
         return Result.success(list);
     }
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java
index bfcea3a..f211341 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java
@@ -13,6 +13,7 @@ import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.utils.ObjUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.domain.RuleAttrInfo;
 import com.muyu.product.domain.model.RuleAttrAddModel;
 import com.muyu.product.domain.model.RuleInfoAddModel;
@@ -21,6 +22,7 @@ import com.muyu.product.domain.req.RuleInfoQueryReq;
 import com.muyu.product.domain.resp.RuleAttributeResp;
 import com.muyu.product.domain.resp.RuleInfoResp;
 import com.muyu.product.domain.resp.RuleInfoUpdResp;
+import com.muyu.product.service.ProjectInfoService;
 import com.muyu.product.service.RuleAttrInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +45,8 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
 
     @Autowired
     private RuleAttrInfoService ruleAttrInfoService;
-
+    @Autowired
+    private ProjectInfoService projectInfoService;
     /**
      * 查询商品规格列表
      *
@@ -105,6 +108,14 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
                     }))
                 .toList();
         boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true);
+        ruleInfoRespList.forEach(item->{
+            LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ProjectInfo::getRuleId,item.getId());
+            List<ProjectInfo> infos = projectInfoService.list(queryWrapper);
+            if(infos.size()>0 && infos !=null){
+                item.setFlag(true);
+            }
+        });
 
         return TableDataInfo.<RuleInfoResp>builder()
                 .rows(ruleInfoRespList)