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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 bf73741..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());
}
@@ -252,11 +254,17 @@
}
}
java.util.Map<Integer, String> relationNameMap = new java.util.HashMap<>();
+ java.util.Map<Integer, String> relationOtherFieldMap = new java.util.HashMap<>();
+ java.util.Map<Integer, String> relationRemarkMap = new java.util.HashMap<>();
if (!relationIds.isEmpty()) {
categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.in(Category::getId, relationIds)
.eq(Category::getDeleted, Constants.ZERO))
- .forEach(c -> relationNameMap.put(c.getId(), c.getName()));
+ .forEach(c -> {
+ relationNameMap.put(c.getId(), c.getName());
+ relationOtherFieldMap.put(c.getId(), c.getOtherField());
+ relationRemarkMap.put(c.getId(), c.getRemark());
+ });
}
for (Category category:categoryList) {
if(StringUtils.isNotBlank(category.getIcon())){
@@ -264,6 +272,8 @@
}
if (category.getRelationId() != null) {
category.setRelationName(relationNameMap.get(category.getRelationId()));
+ category.setRelationOtherField(relationOtherFieldMap.get(category.getRelationId()));
+ category.setRelationRemark(relationRemarkMap.get(category.getRelationId()));
}
}
}
--
Gitblit v1.9.3