bug修复 增加导入

pull/123/MERGE^2
Chengliang 3 years ago
parent 768713bf09
commit 82aa37e2ed

@ -4,12 +4,7 @@ import com.engine.organization.enums.OperateTypeEnum;
import java.lang.annotation.*;
/**
* @Author dxfeng
* @Description:
* @Date 2022/5/9
* @Version V1.0
**/
@Target({ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented

@ -31,6 +31,7 @@ public class ExtendGroupBO {
TypeTreeVO.builder()
.canClick(true)
.addChild(e.getPid() == null)
.isSelected(isSelect(e.getId()))
.domid(String.valueOf(e.getId()))
.childs(Lists.newArrayList())
.hasGroup(isHasGroup(e.getId()))
@ -90,4 +91,13 @@ public class ExtendGroupBO {
}
return tableName;
}
private static boolean isSelect(Long id) {
if (id == 1 || id == 2 || id == 3 || id ==4) {
return true;
}else {
return false;
}
}
}

@ -69,4 +69,7 @@ public class TypeTreeVO {
//父节点id
private Long pid;
public boolean getIsSelected() {
return isSelected;
}
}

@ -233,11 +233,11 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
Map<String, Object> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
// 新建人员
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
btnDatas.put("topMenu", topMenuList);
// 新建人员
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}

Loading…
Cancel
Save