From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 68e743d..f3dd58e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -20,10 +20,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -214,10 +216,28 @@
public BjParamConfigResponse getBjParamConfig(){
BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
- .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
+ .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
- List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
- List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
+ List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){
+ for (BjParam bjParam:roughList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
+ List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(exquisiteList)){
+ for (BjParam bjParam:exquisiteList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
bjParamConfigResponse.setRoughList(roughList);
bjParamConfigResponse.setExquisiteList(exquisiteList);
}
--
Gitblit v1.9.3