diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index 7ac016f7..fede7178 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.api.browser.bean.SearchConditionGroup; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.department.param.DepartmentMoveParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; import java.util.List; @@ -69,7 +70,7 @@ public interface CompService { * * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取基本信息表单 diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index 0433a164..d405d497 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.page.PageInfo; import java.util.Collection; @@ -97,7 +98,7 @@ public interface DepartmentService { * * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取基本信息表单 diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java index 46a59c2c..77f1396b 100644 --- a/src/com/engine/organization/service/GradeService.java +++ b/src/com/engine/organization/service/GradeService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; import com.engine.organization.entity.scheme.param.GradeSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,7 +72,7 @@ public interface GradeService { * 获取列表页面按钮信息 * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取列表tabs diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index dab71f97..0bef172f 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -4,6 +4,7 @@ import com.api.browser.bean.SearchConditionGroup; import com.engine.organization.entity.job.param.JobMergeParam; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.util.MenuBtn; import java.util.Collection; import java.util.List; @@ -36,7 +37,7 @@ public interface JobService { * * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取搜索条件 diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java index 4a8bffff..51613792 100644 --- a/src/com/engine/organization/service/LevelService.java +++ b/src/com/engine/organization/service/LevelService.java @@ -2,8 +2,10 @@ package com.engine.organization.service; import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.param.LevelSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -71,7 +73,7 @@ public interface LevelService { * 获取列表页面按钮信息 * @return */ - Map getTableBtn(); + Map> getTableBtn(); /** * 获取列表tabs diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index f1d6e387..f8e6307b 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -2,6 +2,7 @@ package com.engine.organization.service; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; import java.util.List; @@ -77,7 +78,7 @@ public interface SchemeService { * * @return */ - Map getTableBtn(); + Map> getTableBtn(); /** * 获取左侧树 diff --git a/src/com/engine/organization/service/SequenceService.java b/src/com/engine/organization/service/SequenceService.java index 3cbfb7a3..e03ca0e7 100644 --- a/src/com/engine/organization/service/SequenceService.java +++ b/src/com/engine/organization/service/SequenceService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; import com.engine.organization.entity.sequence.param.SequenceSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,7 +72,7 @@ public interface SequenceService { * 获取列表页面按钮信息 * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取列表tabs diff --git a/src/com/engine/organization/service/StaffPlanService.java b/src/com/engine/organization/service/StaffPlanService.java index a5d1d45e..258d0fd9 100644 --- a/src/com/engine/organization/service/StaffPlanService.java +++ b/src/com/engine/organization/service/StaffPlanService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; import com.engine.organization.entity.staff.param.StaffPlanSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,5 +72,5 @@ public interface StaffPlanService { * 获取列表页面按钮信息 * @return */ - Map getHasRight(); + Map> getHasRight(); } diff --git a/src/com/engine/organization/service/StaffService.java b/src/com/engine/organization/service/StaffService.java index 2090dbf1..10bc523d 100644 --- a/src/com/engine/organization/service/StaffService.java +++ b/src/com/engine/organization/service/StaffService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; import com.engine.organization.entity.staff.param.StaffSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 62d4d58c..969229e1 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -277,7 +277,7 @@ public class CompServiceImpl extends Service implements CompService { } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getDatasNoBtnColum(); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index b2750b9e..1ff4f5d5 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -378,7 +378,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getDatasHasCopy(); } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c6d5adbe..fdd2df61 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -196,7 +196,7 @@ public class GradeServiceImpl extends Service implements GradeService { } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 8426c3e5..a2092b13 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -191,7 +191,7 @@ public class JobServiceImpl extends Service implements JobService { } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getDatasHasCopy(); } diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 0d302b15..92804165 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -163,7 +163,7 @@ public class LevelServiceImpl extends Service implements LevelService { } @Override - public Map getTableBtn() { + public Map> getTableBtn() { return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 4cb8f04a..c4abdcef 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -146,7 +146,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { } @Override - public Map getTableBtn() { + public Map> getTableBtn() { return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index eb83799a..402c14d6 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -160,7 +160,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index e9c0ff5b..2775b5fe 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -236,7 +236,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { } @Override - public Map getHasRight() { + public Map> getHasRight() { return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index e7e4343b..46146de0 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -296,7 +296,10 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getHasRight() { - Map datas = MenuBtn.getCommonBtnDatas(); + Map> datas = MenuBtn.getCommonBtnDatas(); + datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build()); + datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build()); + Map map = new HashMap<>(datas); List addGroups = new ArrayList<>(); List selectItems = new ArrayList<>(); // 方案 @@ -304,10 +307,11 @@ public class StaffServiceImpl extends Service implements StaffService { planIdItem.setRules("required|string"); planIdItem.setHelpfulTip("请选择编制方案后查看数据"); planIdItem.setLabelcol(2); + selectItems.add(planIdItem); addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); - datas.put("condition", addGroups); - return datas; + map.put("condition", addGroups); + return map; } /** diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index 3e2b74df..a7d3521f 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -94,8 +95,8 @@ public class MenuBtn { * 获取常用按钮列表 * @return */ - public static Map getCommonBtnDatas() { - Map btnDatas = new HashMap<>(); + public static Map> getCommonBtnDatas() { + Map> btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); // 新增 @@ -117,8 +118,8 @@ public class MenuBtn { * 获取常用按钮列表 * @return */ - public static Map getDatasNoBtnColum() { - Map btnDatas = new HashMap<>(); + public static Map> getDatasNoBtnColum() { + Map> btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); // 新增 @@ -140,8 +141,8 @@ public class MenuBtn { * 获取常用按钮列表 * @return */ - public static Map getDatasHasCopy() { - Map btnDatas = new HashMap<>(); + public static Map> getDatasHasCopy() { + Map> btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); // 新增 diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index b694a733..17aba1f2 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -13,6 +13,7 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.service.CompService; import com.engine.organization.service.impl.CompServiceImpl; import com.engine.organization.thread.CompanyTriggerRunnable; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; @@ -145,7 +146,7 @@ public class CompWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getCompService(user).getHasRight(); } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index d81f1564..35a6c36d 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -16,6 +16,7 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.impl.DepartmentServiceImpl; import com.engine.organization.thread.DepartmentTriggerRunnable; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.PageInfo; @@ -169,7 +170,7 @@ public class DepartmentWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getDepartmentService(user).getHasRight(); } diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java index 2c0e5735..f92e6935 100644 --- a/src/com/engine/organization/wrapper/GradeWrapper.java +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -11,6 +11,7 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.service.GradeService; import com.engine.organization.service.impl.GradeServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; @@ -132,7 +133,7 @@ public class GradeWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getGradeService(user).getHasRight(); } diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 34719bf1..c575a3ad 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -17,6 +17,7 @@ import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.JobService; import com.engine.organization.service.impl.JobServiceImpl; import com.engine.organization.thread.JobTriggerRunnable; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -68,7 +69,7 @@ public class JobWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getJobService(user).getHasRight(); } diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index c3160208..c93047bd 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -11,6 +11,7 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.service.LevelService; import com.engine.organization.service.impl.LevelServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; @@ -129,7 +130,7 @@ public class LevelWrapper extends OrganizationWrapper { * * @return */ - public Map getTableBtn() { + public Map> getTableBtn() { return getLevelService(user).getTableBtn(); } diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index dfe2d164..a5ccc1e3 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -11,6 +11,7 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.service.SchemeService; import com.engine.organization.service.impl.SchemeServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; @@ -132,7 +133,7 @@ public class SchemeWrapper extends OrganizationWrapper { * * @return */ - public Map getTableBtn() { + public Map> getTableBtn() { return getSchemeService(user).getTableBtn(); } diff --git a/src/com/engine/organization/wrapper/SequenceWrapper.java b/src/com/engine/organization/wrapper/SequenceWrapper.java index 6baf9d1f..0ea24495 100644 --- a/src/com/engine/organization/wrapper/SequenceWrapper.java +++ b/src/com/engine/organization/wrapper/SequenceWrapper.java @@ -10,6 +10,7 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.service.SequenceService; import com.engine.organization.service.impl.SequenceServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; @@ -128,7 +129,7 @@ public class SequenceWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getSequenceService(user).getHasRight(); } diff --git a/src/com/engine/organization/wrapper/StaffPlanWrapper.java b/src/com/engine/organization/wrapper/StaffPlanWrapper.java index bd9628fb..8e63a6db 100644 --- a/src/com/engine/organization/wrapper/StaffPlanWrapper.java +++ b/src/com/engine/organization/wrapper/StaffPlanWrapper.java @@ -10,6 +10,7 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.service.StaffPlanService; import com.engine.organization.service.impl.StaffPlanServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.ibatis.annotations.Param; @@ -129,7 +130,7 @@ public class StaffPlanWrapper extends OrganizationWrapper { * * @return */ - public Map getHasRight() { + public Map> getHasRight() { return getStaffPlanService(user).getHasRight(); } } diff --git a/src/com/engine/organization/wrapper/StaffWrapper.java b/src/com/engine/organization/wrapper/StaffWrapper.java index 597f2b9c..3fc552ef 100644 --- a/src/com/engine/organization/wrapper/StaffWrapper.java +++ b/src/com/engine/organization/wrapper/StaffWrapper.java @@ -12,6 +12,7 @@ import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.service.StaffService; import com.engine.organization.service.impl.StaffServiceImpl; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationWrapper; import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User;