Merge pull request '花名册列表按钮权限优化' (#157) from feature/dxf into develop

Reviewed-on: #157

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

@@ -460,17 +460,16 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     @Override
     public Map<String, Object> getHasRight() {
         Map<String, Object> btnDatas = new HashMap<>();
-        if (HasRightUtil.hasRight(user, RIGHT_NAME, true)) {
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
+        if (HasRightUtil.hasRight(user, RIGHT_NAME, true)) {
             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("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").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("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build());
+        }
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
         rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        btnDatas.put("topMenu", topMenuList);
         btnDatas.put("rightMenu", rightMenuList);
-        }
         btnDatas.put("hasRight", true);
         return btnDatas;
     }