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

Merge pull request 'bug修复' (#50) from feature/cl into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/50
This commit is contained in:
liang.cheng 2022-11-10 14:16:42 +08:00
parent 0da123fcef 8e93568aa4
commit f2ea296832
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
View File

@ -163,17 +163,17 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if("joblevel".equals(importType)){
List<FieldTransferParam> fieldDatas = new ArrayList<>();
fieldDatas.add(FieldTransferParam.builder().id("1").name("方案编号").build());
fieldDatas.add(FieldTransferParam.builder().id("2").name("方案名称").build());
fieldDatas.add(FieldTransferParam.builder().id("3").name("职级编号").build());
fieldDatas.add(FieldTransferParam.builder().id("4").name("职级名称").build());
fieldDatas.add(FieldTransferParam.builder().id("1").name("职级编号").build());
fieldDatas.add(FieldTransferParam.builder().id("2").name("职级名称").build());
fieldDatas.add(FieldTransferParam.builder().id("3").name("方案编号").build());
fieldDatas.add(FieldTransferParam.builder().id("4").name("方案名称").build());
fieldDatas.add(FieldTransferParam.builder().id("5").name("职等编号").build());
fieldDatas.add(FieldTransferParam.builder().id("6").name("职等名称").build());
fieldDatas.add(FieldTransferParam.builder().id("7").name("方案说明").build());
fieldDatas.add(FieldTransferParam.builder().id("8").name("职级说明").build());
fieldDatas.add(FieldTransferParam.builder().id("9").name("职等说明").build());
List<String> selectedKeys = new ArrayList<>();
for(int i=0;i<fieldDatas.size();i++){
for(int i=0;i<fieldDatas.subList(0,6).size();i++){
selectedKeys.add(fieldDatas.get(i).getId());
}
returnMaps.put("data", fieldDatas);

4
src/com/engine/organization/service/impl/PostInfoServiceImpl.java
View File

@ -191,13 +191,17 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
topMenuList.add(MenuBtn.topMenu_addNew());
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
// 显示列定制
rightMenuList.add(MenuBtn.rightMenu_btnColumn());
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}