Merge pull request '岗位增加刷新按钮' (#99) from feature/cl into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/99

src/com/engine/organization/service/JobService.java

@@ -117,4 +117,9 @@ public interface JobService {
      * @return
      */
     int mergeJob(JobMergeParam mergeParam);
+
+    /**
+     * 刷新岗位数据
+     */
+    void refresh();
 }

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

@@ -190,9 +190,11 @@ public class JobServiceImpl extends Service implements JobService {
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 批量删除
         topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("新增").type("BTN_REFRESH").build());
         btnDatas.put("topMenu", topMenuList);
         // 日志
         rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }
@@ -563,6 +565,11 @@ public class JobServiceImpl extends Service implements JobService {
         return updateCount;
     }
 
+    @Override
+    public void refresh() {
+        
+    }
+
 
     void recursionMergeJob(List<JobPO> jobs, Integer ecCompany, Integer ecDepartment, Long parentJob) {
         for (JobPO job : jobs) {

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

@@ -232,6 +232,19 @@ public class JobController {
         }
     }
 
+    @GET
+    @Path("/refresh")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult refresh(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            getJobWrapper(user).refresh();
+            return ReturnResult.successed();
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
     /**
      * 高级搜索条件
      *

src/com/engine/organization/wrapper/JobWrapper.java

@@ -231,4 +231,8 @@ public class JobWrapper extends OrganizationWrapper {
 
         return mergeJob;
     }
+
+    public void refresh() {
+        getJobService(user).refresh();
+    }
 }