From cfbc3497226f1825e71e354d0bf5ff9dd5a391c9 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 19 Mar 2025 15:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/domain/ServiceCatalogCategory.java    | 11 ++++++++---
 .../domain/bo/ServiceCatalogCategoryBo.java        | 14 ++++++++++----
 .../domain/vo/ServiceCatalogCategoryVo.java        | 14 ++++++++++----
 .../impl/ServiceCatalogCategoryServiceImpl.java    |  2 +-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ServiceCatalogCategory.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ServiceCatalogCategory.java
index 83fb621..831cdfa 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ServiceCatalogCategory.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ServiceCatalogCategory.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 服务目录-类别对象 service_catalog_category
  *
  * @author gejunhao
- * @date 2025-03-07
+ * @date 2025-03-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -31,9 +31,14 @@ public class ServiceCatalogCategory extends TenantEntity {
     private String id;
 
     /**
-     * 目录名称，表示目录的名字
+     * 项目id
      */
-    private String name;
+    private String projectId;
+
+    /**
+     * 项目目录名称
+     */
+    private String projectName;
 
     /**
      * 描述
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ServiceCatalogCategoryBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ServiceCatalogCategoryBo.java
index 33656f7..5c23cba 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ServiceCatalogCategoryBo.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ServiceCatalogCategoryBo.java
@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
  * 服务目录-类别业务对象 service_catalog_category
  *
  * @author gejunhao
- * @date 2025-03-07
+ * @date 2025-03-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -27,10 +27,16 @@ public class ServiceCatalogCategoryBo extends BaseEntity {
     private String id;
 
     /**
-     * 目录名称，表示目录的名字
+     * 项目id
      */
-    @NotBlank(message = "目录名称，表示目录的名字不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
+    @NotBlank(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String projectId;
+
+    /**
+     * 项目目录名称
+     */
+    @NotBlank(message = "项目目录名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String projectName;
 
     /**
      * 描述
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ServiceCatalogCategoryVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ServiceCatalogCategoryVo.java
index 5515648..4d697c1 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ServiceCatalogCategoryVo.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ServiceCatalogCategoryVo.java
@@ -18,7 +18,7 @@ import java.util.Date;
  * 服务目录-类别视图对象 service_catalog_category
  *
  * @author gejunhao
- * @date 2025-03-07
+ * @date 2025-03-19
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -35,10 +35,16 @@ public class ServiceCatalogCategoryVo implements Serializable {
     private String id;
 
     /**
-     * 目录名称，表示目录的名字
+     * 项目id
      */
-    @ExcelProperty(value = "目录名称，表示目录的名字")
-    private String name;
+    @ExcelProperty(value = "项目id")
+    private String projectId;
+
+    /**
+     * 项目目录名称
+     */
+    @ExcelProperty(value = "项目目录名称")
+    private String projectName;
 
     /**
      * 描述
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java
index 23f3f18..607cc92 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java
@@ -69,7 +69,7 @@ public class ServiceCatalogCategoryServiceImpl implements IServiceCatalogCategor
     private LambdaQueryWrapper<ServiceCatalogCategory> buildQueryWrapper(ServiceCatalogCategoryBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ServiceCatalogCategory> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getName()), ServiceCatalogCategory::getName, bo.getName());
+        lqw.like(StringUtils.isNotBlank(bo.getProjectName()), ServiceCatalogCategory::getProjectName, bo.getProjectName());
         lqw.eq(StringUtils.isNotBlank(bo.getDescription()), ServiceCatalogCategory::getDescription, bo.getDescription());
         lqw.eq(StringUtils.isNotBlank(bo.getCode()), ServiceCatalogCategory::getCode, bo.getCode());
         lqw.eq(bo.getIsChildren() != null, ServiceCatalogCategory::getIsChildren, bo.getIsChildren());