Merge pull request '人员简历相关接口开发' (#115) from feature/dxf into develop

Reviewed-on: #115

src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java

@@ -18,8 +18,8 @@ public class ResourceBO {
         return builderJobs.stream().map(item -> {
             SearchTree tree = new SearchTree();
             tree.setCanClick(true);
-            tree.setCanceled(true);
-            tree.setIcon("icon-coms-content-o");
+            tree.setCanceled(false);
+            tree.setIcon("icon-coms-currency-Customer");
             tree.setId(item.getId().toString());
             tree.setIsParent(false);
             tree.setIsVirtual("0");

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

@@ -59,7 +59,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         String keyword = params.getKeyword();
         String id = params.getId();
         String type = Util.null2String(params.getType());
-        List<SearchTree> treeList = getFilterCompany(id, type, keyword);
+        List<SearchTree> treeList = getFilterDatas(id, type, keyword);
         return SearchTreeUtil.getSearchTree(type, treeList);
     }
 
@@ -70,23 +70,23 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-New-Flow").menuName("人员筛选").type("BTN_Screening").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-edit").menuName("导出当前").type("BTN_CurrentExport").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms-Delete").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms-Delete").menuName("全部导出").type("BTN_AllExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
 
         resultMap.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-New-Flow").menuName("人员筛选").type("BTN_Screening").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-edit").menuName("导出当前").type("BTN_CurrentExport").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms-Delete").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms-Delete").menuName("全部导出").type("BTN_AllExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
 
         resultMap.put("rightMenu", rightMenuList);
         return resultMap;
     }
 
-    public List<SearchTree> getFilterCompany(String id, String type, String keyword) {
+    public List<SearchTree> getFilterDatas(String id, String type, String keyword) {
         List<SearchTree> searchTree = new ArrayList<>();
         // 通过分部、公司 组装数据
         if (StringUtil.isEmpty(id) || ModuleTypeEnum.subcompanyfielddefined.getValue().toString().equals(type)) {

src/com/engine/organization/web/PersonnelResumeController.java

@@ -39,16 +39,11 @@ public class PersonnelResumeController {
     @GET
     @Path("/getSearchTree")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-        try {
-            User user = HrmUserVarify.getUser(request, response);
-            Map<String, Object> map = ParamUtil.request2Map(request);
-            SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class);
-            return ReturnResult.successed(getPersonnelResumeWrapper(user).getSearchTree(params));
-        } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e);
-        }
-
+    public Map<String, Object> getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> map = ParamUtil.request2Map(request);
+        SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class);
+        return getPersonnelResumeWrapper(user).getSearchTree(params);
     }
 
     @GET