From 9f8b3700ffbcc616a97e7ee2ea283ef4df3d666a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 04 六月 2026 08:43:55 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index f53c922..025157d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -61,7 +61,7 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         // type=2锛堝瘎瀛樿鏄庯級detail涓嶅繀濉紝鍏朵粬绫诲瀷蹇呭~
-        if (!Constants.equalsInteger(category.getType(), Constants.TWO) && StringUtils.isBlank(category.getDetail())) {
+        if (!Constants.equalsInteger(category.getType(), Constants.TWO)&& !Constants.equalsInteger(category.getType(), Constants.FIVE) && StringUtils.isBlank(category.getDetail())) {
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         validateByType(category);
@@ -107,7 +107,7 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         // type=2锛堝瘎瀛樿鏄庯級detail涓嶅繀濉紝鍏朵粬绫诲瀷蹇呭~
-        if (!Constants.equalsInteger(category.getType(), Constants.TWO) && StringUtils.isBlank(category.getDetail())) {
+        if (!Constants.equalsInteger(category.getType(), Constants.TWO) && !Constants.equalsInteger(category.getType(), Constants.FIVE) && StringUtils.isBlank(category.getDetail())) {
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         validateByType(category);
@@ -172,7 +172,9 @@
         pageWrap.getModel().setDeleted(Constants.ZERO);
         queryWrapper.selectAll(Category.class)
                 .selectAs(SystemUser::getUsername, Category::getUpdateUserName)
-                .leftJoin(SystemUser.class,SystemUser::getId,Category::getUpdateUser);
+                .select("c2.name", Category::getRelationName)
+                .leftJoin(SystemUser.class,SystemUser::getId,Category::getUpdateUser)
+                .leftJoin("category c2 on c2.id = t.relation_id");
         if (pageWrap.getModel().getId() != null) {
             queryWrapper.eq(Category::getId, pageWrap.getModel().getId());
         }

--
Gitblit v1.9.3