修改自定义表头BUG

This commit is contained in:
高嵩
2023-02-13 21:44:37 +08:00
parent 5ed44e0e11
commit c755f1c73e
@@ -219,6 +219,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag);
List<HeadCustomEO> list = this.list(wrapper);
List<HeadCustomVO> headCustomVOOneList = new LinkedList<>();
List<HeadCustomVO> res = new ArrayList<>();
if (ObjectUtils.isNotEmpty(list)) {
//列表表头一级
List<HeadCustomEO> oneList = list.stream()
@@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
getHeadCustomVO(cut, headCustomEO, headCustomVO);
headCustomVOOneList.add(headCustomVO);
}
}
List<HeadCustomVO> res = new ArrayList<>();
if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
} else {
res = headCustomVOOneList;
if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
} else {
res = headCustomVOOneList;
}
}
return res;
}