同步优化初步3

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

@@ -14,6 +14,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.SyncDealQO;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,15 +35,21 @@ public class SyncDealContoller extends WebBaseController {
 
     @RequestMapping("department-sync")
     @ResponseBody
-    public HaobanResponse departmentBatchSync(@RequestBody SyncDealQO qo) {
-        LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
-        String wxEnterpriseId = login.getWxEnterpriseId();
-        String key = "haoban-sync-department-" + wxEnterpriseId;
-        if (RedisUtil.getCache(key) != null) {
-            return resultResponse(HaoBanErrCode.ERR_10011);
+    public HaobanResponse departmentBatchSync(@RequestBody SyncDealQO qo, String wxEid) {
+
+        if (StringUtils.isNotBlank(wxEid)) {
+            String task = dealSyncOperationApiService.createTask("门店同步", "11111", "部门同步");
+            dealSyncOperationApiService.dealDepartment(task, wxEid, qo.getAddDepartment(), qo.getEditDepartment());
+        } else {
+            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            String wxEnterpriseId = login.getWxEnterpriseId();
+            String key = "haoban-sync-department-" + wxEnterpriseId;
+            if (RedisUtil.getCache(key) != null) {
+                return resultResponse(HaoBanErrCode.ERR_10011);
+            }
+            String task = dealSyncOperationApiService.createTask("门店同步", login.getStaffDTO().getStaffId(), "部门同步");
+            dealSyncOperationApiService.dealDepartment(task, login.getWxEnterpriseId(), qo.getAddDepartment(), qo.getEditDepartment());
         }
-        String task = dealSyncOperationApiService.createTask("门店同步", login.getStaffDTO().getStaffId(), "部门同步");
-        dealSyncOperationApiService.dealDepartment(task, login.getWxEnterpriseId(), qo.getAddDepartment(), qo.getEditDepartment());
 
         return resultResponse(HaoBanErrCode.ERR_1, key);