From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 46ee50f..f53c922 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
@@ -57,8 +57,11 @@
if(Objects.isNull(category)
|| Objects.isNull(category.getType())
|| Objects.isNull(category.getName())
- || StringUtils.isBlank(category.getDetail())
){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ // type=2锛堝瘎瀛樿鏄庯級detail涓嶅繀濉紝鍏朵粬绫诲瀷蹇呭～
+ if (!Constants.equalsInteger(category.getType(), Constants.TWO) && StringUtils.isBlank(category.getDetail())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
validateByType(category);
@@ -100,8 +103,11 @@
|| Objects.isNull(category.getId())
|| Objects.isNull(category.getType())
|| Objects.isNull(category.getName())
- || StringUtils.isBlank(category.getDetail())
){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ // type=2锛堝瘎瀛樿鏄庯級detail涓嶅繀濉紝鍏朵粬绫诲瀷蹇呭～
+ if (!Constants.equalsInteger(category.getType(), Constants.TWO) && StringUtils.isBlank(category.getDetail())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
validateByType(category);
@@ -140,7 +146,7 @@
}
if(StringUtils.isNotBlank(category.getIcon())){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_FILES).getCode();
category.setIconFull(path + category.getIcon());
}
return category;
@@ -209,7 +215,7 @@
PageData<Category> result =PageData.from(categoryMapper.selectJoinPage(page, Category.class,queryWrapper));
if(result!=null && result.getRecords()!=null){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_FILES).getCode();
for(Category cate : result.getRecords()){
try {
if(StringUtils.isNotBlank(cate.getIcon())){
@@ -237,10 +243,35 @@
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_FILES).getCode();
+ // 鏀堕泦闈炵┖鐨� relationId 鎵归噺鏌ヨ
+ java.util.Set<Integer> relationIds = new java.util.HashSet<>();
+ for (Category category : categoryList) {
+ if (category.getRelationId() != null) {
+ relationIds.add(category.getRelationId());
+ }
+ }
+ 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());
+ relationOtherFieldMap.put(c.getId(), c.getOtherField());
+ relationRemarkMap.put(c.getId(), c.getRemark());
+ });
+ }
for (Category category:categoryList) {
if(StringUtils.isNotBlank(category.getIcon())){
category.setIconFull(path + category.getIcon());
+ }
+ if (category.getRelationId() != null) {
+ category.setRelationName(relationNameMap.get(category.getRelationId()));
+ category.setRelationOtherField(relationOtherFieldMap.get(category.getRelationId()));
+ category.setRelationRemark(relationRemarkMap.get(category.getRelationId()));
}
}
}
@@ -275,8 +306,8 @@
.orderByAsc(Category::getSortnum));
// 3. 鎷兼帴鍥炬爣鍏ㄨ矾寰�
if (!CollectionUtils.isEmpty(sizeList)) {
- String path = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.CATEGORY_FILES).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_FILES).getCode();
for (Category cate : sizeList) {
if (StringUtils.isNotBlank(cate.getIcon())) {
cate.setIconFull(path + cate.getIcon());
--
Gitblit v1.9.3