Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-09-12 11:26:20 +08:00
parent 453fff16c1 9231b5e0ae
commit c9a8a4ae44
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java
View File

@@ -19,6 +19,7 @@ import com.njcn.user.pojo.param.FunctionParam;
import com.njcn.user.pojo.po.Function;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Comparator;
@@ -83,7 +84,17 @@ public class DicServiceImpl extends ServiceImpl<DicMapper, Dic> implements IDicS
public List<DicVO> getDicTree(String code) {
List<DicVO> list = dicMapper.getAllDic();
return list.stream()
.filter(fun -> Objects.equals(TemplateTreeEnum.FATHER_PID,fun.getPid())&&fun.getCode().equals(code))
.filter(fun -> {
boolean flag =true;
boolean flag1 =true;
flag = Objects.equals(TemplateTreeEnum.FATHER_PID,fun.getPid());
if(!StringUtils.isEmpty(code)){
flag1 = fun.getCode().equals(code);
}
return flag&&flag1;
})
.peek(funS -> funS.setChildren(getChildList(funS, list)))
.sorted(Comparator.comparingInt(DicVO::getSort))
.collect(Collectors.toList());