Pre Merge pull request !237 from reset/feature/cl

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 
     /**
      * 获取基本信息表单

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 
     /**
      * 获取基本信息表单

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 
     /**
      * 获取列表tabs

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 
     /**
      * 获取搜索条件

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<String, Object> getTableBtn();
+    Map<String, List<MenuBtn>> getTableBtn();
 
     /**
      * 获取列表tabs

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<String, Object> getTableBtn();
+    Map<String, List<MenuBtn>> getTableBtn();
 
     /**
      * 获取左侧树

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 
     /**
      * 获取列表tabs

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<String, Object> getHasRight();
+    Map<String, List<MenuBtn>> getHasRight();
 }

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;
 
 /**

src/com/engine/organization/service/impl/CompServiceImpl.java

@@ -277,7 +277,7 @@ public class CompServiceImpl extends Service implements CompService {
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getDatasNoBtnColum();
     }
 

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -378,7 +378,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getDatasHasCopy();
     }
 

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -196,7 +196,7 @@ public class GradeServiceImpl extends Service implements GradeService {
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -191,7 +191,7 @@ public class JobServiceImpl extends Service implements JobService {
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getDatasHasCopy();
     }
 

src/com/engine/organization/service/impl/LevelServiceImpl.java

@@ -163,7 +163,7 @@ public class LevelServiceImpl extends Service implements LevelService {
     }
 
     @Override
-    public Map<String, Object> getTableBtn() {
+    public Map<String, List<MenuBtn>> getTableBtn() {
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -146,7 +146,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
     }
 
     @Override
-    public Map<String, Object> getTableBtn() {
+    public Map<String, List<MenuBtn>> getTableBtn() {
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/SequenceServiceImpl.java

@@ -160,7 +160,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/StaffPlanServiceImpl.java

@@ -236,7 +236,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
     }
 
     @Override
-    public Map<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/StaffServiceImpl.java

@@ -296,7 +296,10 @@ public class StaffServiceImpl extends Service implements StaffService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        Map<String, Object> datas = MenuBtn.getCommonBtnDatas();
+        Map<String, List<MenuBtn>> 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<String, Object> map = new HashMap<>(datas);
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> 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);
+        map.put("condition", addGroups);
-        return datas;
+        return map;
     }
 
     /**

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<String, Object> getCommonBtnDatas() {
+    public static Map<String, List<MenuBtn>> getCommonBtnDatas() {
-        Map<String, Object> btnDatas = new HashMap<>();
+        Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
@@ -117,8 +118,8 @@ public class MenuBtn {
      * 获取常用按钮列表
      * @return
      */
-    public static Map<String, Object> getDatasNoBtnColum() {
+    public static Map<String, List<MenuBtn>> getDatasNoBtnColum() {
-        Map<String, Object> btnDatas = new HashMap<>();
+        Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
@@ -140,8 +141,8 @@ public class MenuBtn {
      * 获取常用按钮列表
      * @return
      */
-    public static Map<String, Object> getDatasHasCopy() {
+    public static Map<String, List<MenuBtn>> getDatasHasCopy() {
-        Map<String, Object> btnDatas = new HashMap<>();
+        Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getCompService(user).getHasRight();
     }
 

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getDepartmentService(user).getHasRight();
     }
 

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getGradeService(user).getHasRight();
     }
 

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getJobService(user).getHasRight();
     }
 

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<String, Object> getTableBtn() {
+    public Map<String, List<MenuBtn>> getTableBtn() {
         return getLevelService(user).getTableBtn();
     }
 

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<String, Object> getTableBtn() {
+    public Map<String, List<MenuBtn>> getTableBtn() {
         return getSchemeService(user).getTableBtn();
     }
 

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getSequenceService(user).getHasRight();
     }
 

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<String, Object> getHasRight() {
+    public Map<String, List<MenuBtn>> getHasRight() {
         return getStaffPlanService(user).getHasRight();
     }
 }

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;