|
@@ -96,6 +96,9 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
|
|
|
List<TextdictInfoVO> textdictList= baseMapper.selectTextdictInfoByExcelId(page, textdictInfo);
|
|
|
if (textdict == null || textdict.isEmpty()) {
|
|
|
textdict = textdictList;
|
|
|
+ if (textdict != null) {
|
|
|
+ textdict.forEach(textdictInfoVO -> textdictInfoVO.setIsSystem(2));
|
|
|
+ }
|
|
|
} else if (textdictList != null && !textdictList.isEmpty()) {
|
|
|
Map<String, Map<String, TextdictInfoVO>> map = textdict.stream().collect(Collectors.groupingBy(TextdictInfoVO::getColKey, Collectors.toMap(TextdictInfoVO::getSigRoleId, v -> v, (v1, v2) -> v1)));
|
|
|
List<TextdictInfoVO> collect = textdictList.stream().filter(textdictInfoVO -> {
|