企微管理员控制

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -285,29 +285,6 @@ public class ApplicationController extends WebBaseController {
     }
 
     /**
-     * 通讯录同步
-     *
-     * @return
-     */
-    @RequestMapping("sync-qywx")
-    public Object syncQywx() {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = login.getWxEnterpriseId();
-        WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
-        if (enterpriseDTO != null) {
-            String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getClerkId(), "后门同步企业微信架构");
-            if (StringUtils.isBlank(taskId)) {
-                return resultResponse(HaoBanErrCode.ERR_0, false);
-            }
-            String ret = dealSyncOperationApiService.dealQywxDepartment(taskId, wxEnterpriseId);
-            if (null != ret) {
-                return resultResponse(HaoBanErrCode.ERR_0, ret, null, null);
-            }
-        }
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-    /**
      * 初始化应用
      *
      * @param wxEnterpriseId

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -24,8 +24,6 @@ import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
-import com.gic.haoban.manage.web.vo.AdminRoleVO;
-import com.gic.haoban.manage.web.vo.AdminVO;
 import com.gic.haoban.manage.web.vo.ClerkInfoVo;
 import com.gic.haoban.manage.web.vo.StaffExportVO;
 import com.gic.haoban.manage.web.vo.StaffVO;
@@ -79,6 +77,8 @@ public class StaffController extends WebBaseController {
     private QywxSuiteApiService qywxSuiteApiService;
     @Autowired
     private HaobanUserApiService haobanUserApiService ;
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService;
 
     
     @RequestMapping("set-default-gicenterprise")
@@ -464,6 +464,9 @@ public class StaffController extends WebBaseController {
      */
     @RequestMapping("staff-export")
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, BasePageInfo pageInfo) {
+        if(!isAdmin()) {
+            return this.resultResponse(HaoBanErrCode.ERR_10030) ;
+        }
         List<String> departmentIdSet = new ArrayList<>();
         departmentIdSet.add(departmentId);
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
@@ -559,6 +562,33 @@ public class StaffController extends WebBaseController {
         }
     }
     
+    
+    /**
+     * 通讯录同步
+     *
+     * @return
+     */
+    @RequestMapping("sync-qywx")
+    public Object syncQywx() {
+        if(!isAdmin()) {
+            return this.resultResponse(HaoBanErrCode.ERR_10030) ;
+        }
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
+        if (enterpriseDTO != null) {
+            String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getClerkId(), "后门同步企业微信架构");
+            if (StringUtils.isBlank(taskId)) {
+                return resultResponse(HaoBanErrCode.ERR_0, false);
+            }
+            String ret = dealSyncOperationApiService.dealQywxDepartment(taskId, wxEnterpriseId);
+            if (null != ret) {
+                return resultResponse(HaoBanErrCode.ERR_0, ret, null, null);
+            }
+        }
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
+    
     private boolean isAdmin(){
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String staffId = login.getStaffId() ;

haoban-manage3-web/src/main/webapp/WEB-INF/spring-interceptor.xml

@@ -42,6 +42,7 @@
             <mvc:exclude-mapping path="/upload-file-voice"/>
             <mvc:exclude-mapping path="/get-login-qrcode"/>
             <mvc:exclude-mapping path="/gic-login-check"/>
+            <mvc:exclude-mapping path="/staff-export"/>
             <bean class="com.gic.web.common.inteceptor.RightInterceptor" />
         </mvc:interceptor>
     </mvc:interceptors>