Browse Source

修复用户及机构选择列表设置默认值导致的报错。

main
likunming 4 weeks ago
parent
commit
ff4cf76c86
  1. 4
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/OrgSearchServiceImpl.java
  2. 4
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java

4
io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/OrgSearchServiceImpl.java

@ -44,6 +44,7 @@ public class OrgSearchServiceImpl implements OrgSearchService {
* 所以最外层无需处理直接处理最外层的 criteria 数组
*/
List<Criteria> criterias = queryParameter.getCriterias().get(0).getCriteria();
if (criterias!=null && criterias.size() > 0) {
for (Criteria criteria: criterias) {
if (criteria.getFieldName()!=null) {
Boolean isOrgCriteria = Arrays.stream(SearchConstant.ORG_CRITERIA_FIELD_NAMES).anyMatch(criteria.getFieldName()::equals);
@ -65,6 +66,9 @@ public class OrgSearchServiceImpl implements OrgSearchService {
} else {
return queryParameter;
}
} else {
return queryParameter;
}
}
public List<String> findOrgIds(String fieldName, Criteria criteria) throws Exception {

4
io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java

@ -49,6 +49,7 @@ public class UserSearchServiceImpl implements UserSearchService {
* 组装的条件在 queryParameter 中数组下标第一位格式一定是 { fieldName: null, operator: 'and', criteria: [...] }
*/
List<Criteria> criterias = queryParameter.getCriterias().get(0).getCriteria();
if (criterias!=null && criterias.size() > 0) {
for (Criteria criteria: criterias) {
if (criteria.getFieldName()!=null) {
Boolean isOrgCriteria = Arrays.stream(SearchConstant.ORG_CRITERIA_FIELD_NAMES).anyMatch(criteria.getFieldName()::equals);
@ -77,6 +78,9 @@ public class UserSearchServiceImpl implements UserSearchService {
} else {
return queryParameter;
}
} else {
return queryParameter;
}
}
private void addOtherCriteria(List<Criteria> userCriteriaList, QueryParameter queryParameter) {

Loading…
Cancel
Save