productDev/zbomyoujia.git

			@@ -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);
			}