WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改自定义表头BUG

Browse Source
This commit is contained in:
高嵩
2023-02-13 21:44:37 +08:00
parent 5ed44e0e11
commit c755f1c73e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+6 -7
View File
@@ -219,6 +219,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag); wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag);
List<HeadCustomEO> list = this.list(wrapper); List<HeadCustomEO> list = this.list(wrapper);
List<HeadCustomVO> headCustomVOOneList = new LinkedList<>(); List<HeadCustomVO> headCustomVOOneList = new LinkedList<>();
List<HeadCustomVO> res = new ArrayList<>();
if (ObjectUtils.isNotEmpty(list)) { if (ObjectUtils.isNotEmpty(list)) {
//列表表头一级 //列表表头一级
List<HeadCustomEO> oneList = list.stream() List<HeadCustomEO> oneList = list.stream()
@@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
getHeadCustomVO(cut, headCustomEO, headCustomVO); getHeadCustomVO(cut, headCustomEO, headCustomVO);
headCustomVOOneList.add(headCustomVO); headCustomVOOneList.add(headCustomVO);
} }
} if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
List<HeadCustomVO> res = new ArrayList<>(); } else {
if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) { res = headCustomVOOneList;
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag); }
} else {
res = headCustomVOOneList;
} }
return res; return res;
} }