ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 高级搜索构造条件空指针bug

Browse Source
This commit is contained in:
mzaxd
2024-03-20 11:25:25 +08:00
parent afb4d67717
commit 3720d162e6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+6 -6
View File
@@ -200,15 +200,15 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (parameterMap.containsKey("home_search_key")) { if (parameterMap.containsKey("home_search_key")) {
parameterMap.remove("home_search_key"); parameterMap.remove("home_search_key");
fieldListSelect = fieldList; fieldListSelect = fieldList;
fieldListCondition = fieldList.stream().filter(lawsTag -> Objects.equals(YesOrNoEnum.YES.getValue(), fieldListCondition = fieldList.stream().filter(lawsTag -> Objects.equals(YesOrNoEnum.YES.getInteger(),
lawsTag.getIsShowSearch().toString())).collect(Collectors.toList()); lawsTag.getIsShowSearch())).collect(Collectors.toList());
} else { } else {
// 筛选出查询列表显示的字段（不传id查列表） // 筛选出查询列表显示的字段（不传id查列表）
fieldListSelect = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() fieldListSelect = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger()
.equals(lawsTag.getIsShowList().toString())).collect(Collectors.toList()); .equals(lawsTag.getIsShowList())).collect(Collectors.toList());
// 筛选出用于查询的字段 // 筛选出用于查询的字段
fieldListCondition = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() fieldListCondition = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger()
.equals(lawsTag.getIsQuery().toString())).collect(Collectors.toList()); .equals(lawsTag.getIsQuery())).collect(Collectors.toList());
} }
// 加一个create_by字段 // 加一个create_by字段