liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

花名册高级搜索BUG修复

This commit is contained in:
dxfeng 2023-01-10 14:08:41 +08:00
parent 4ba6d5c21e
commit 9dbce1e8c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -628,7 +628,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", scopeid);
List<SearchConditionItem> conditionItems = new ArrayList<>();
for (String fieldName : fieldNames) {
for (String field : fieldNames) {
String fieldName = field.substring(field.lastIndexOf("_") + 1);
JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
if (null == hrmFieldConf) {
continue;
@ -674,11 +675,11 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
List<String> workFields = new ArrayList<>();
for (String fieldName : split) {
if (fieldName.startsWith(HrmGroupEnum.HRM_BASIC.getGroupType().toString())) {
basicFields.add(fieldName.substring(fieldName.lastIndexOf("_") + 1));
basicFields.add(fieldName);
} else if (fieldName.startsWith(HrmGroupEnum.HRM_PERSONAL.getGroupType().toString())) {
personalFields.add(fieldName.substring(fieldName.lastIndexOf("_") + 1));
personalFields.add(fieldName);
} else if (fieldName.startsWith(HrmGroupEnum.HRM_WORK.getGroupType().toString())) {
workFields.add(fieldName.substring(fieldName.lastIndexOf("_") + 1));
workFields.add(fieldName);
}
}
return SearchTemplatePO.builder().basicFields(StringUtils.join(basicFields, ",")).personalFields(StringUtils.join(personalFields, ",")).workFields(StringUtils.join(workFields, ",")).build();