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

微调

Browse Source
This commit is contained in:
hongawen
2024-09-18 16:32:10 +08:00
parent 78ba6903c6
commit c5b63acb27
9 changed files with 9 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
View File

@@ -5,8 +5,8 @@
<select id="getAllFunctions" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -21,8 +21,8 @@
<select id="getFunctionsByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -42,8 +42,8 @@
<select id="getUserFunctionsByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -63,8 +63,8 @@
<select id="getByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,

2
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
}
List<FunctionVO> functionVOList = functionMapper.getFunctionsByList(functionList);
result = functionVOList.stream()
.filter(fun -> Objects.equals(FunctionState.FATHER_PID,fun.getPid()))
.filter(fun -> Objects.equals(FunctionState.FATHER_PID,fun.getPid().trim()))
.peek(funS -> funS.setChildren(getChildCategoryList(funS, functionVOList)))
.sorted(Comparator.comparingInt(FunctionVO::getSort))
.collect(Collectors.toList());