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

Merge pull request '列定制BUG修复' (#147) from danikor into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/147
This commit is contained in:
dxfeng 2023-01-16 17:22:23 +08:00
parent d207134980 8947e6da3a
commit d68cfcee95
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/organization/service/HrmResourceService.java
View File

@ -4,7 +4,6 @@ import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam;
import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
import com.engine.organization.entity.searchtree.SearchTreeParams;
import java.util.List;
import java.util.Map;
/**
@ -126,7 +125,7 @@ public interface HrmResourceService {
* @param params
* @return
*/
List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params);
Map<String, Object> getSearchTemplate(Map<String, Object> params);
/**
* 保存定制列模板

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

@ -284,18 +284,26 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
}
@Override
public List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params) {
public Map<String, Object> getSearchTemplate(Map<String, Object> params) {
Map<String, Object> returnMap = new HashMap<>();
String type = Util.null2String(params.get("type"));
int userUID = user.getUID();
// 根据ID查询所存储的模板
List<SearchTemplateParam> templates;
if ("custom".equals(type)) {
templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
if (null != usedCustomTemplate) {
returnMap.put("templateId", usedCustomTemplate.getId());
} else {
returnMap.put("templateId", "-1");
}
} else {
templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
}
templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
return templates;
returnMap.put("templates", templates);
return returnMap;
}
@Override

3
src/com/engine/organization/wrapper/HrmResourceWrapper.java
View File

@ -13,7 +13,6 @@ import com.engine.organization.service.impl.HrmResourceServiceImpl;
import com.engine.organization.util.OrganizationWrapper;
import weaver.hrm.User;
import java.util.List;
import java.util.Map;
/**
@ -88,7 +87,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
return getHrmResourceService(user).updateTabForm(params);
}
public List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params) {
public Map<String, Object> getSearchTemplate(Map<String, Object> params) {
return getHrmResourceService(user).getSearchTemplate(params);
}