fix：绑定修改

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

@@ -842,7 +842,7 @@ public class ClerkController extends WebBaseController {
      */
     @HttpLimit
     @RequestMapping("bind-staff")
-    public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType, Integer manageFlag) {
+    public HaobanResponse bindStaff(String clerkId, String staffId, String enterpriseId, Integer auditType, Integer manageFlag) {
         if (StringUtils.isAnyBlank(clerkId, staffId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
@@ -861,16 +861,26 @@ public class ClerkController extends WebBaseController {
         if (auditDTO != null) {
             return resultResponse(HaoBanErrCode.ERR_10018);
         }
-        StaffClerkRelationDTO haveClerkCode = staffClerkRelationApiService.getOneByStoreIdAndStaffId(clerk.getStoreId(), staffId);
-        if (haveClerkCode != null) {
-            return resultResponse(HaoBanErrCode.ERR_10020);
+        String storeId = "";
+        String storeName = "";
+        if (manageFlag != null && manageFlag == 1) {
+            //区经无门店
+        } else {
+            storeId = clerk.getStoreId();
+            StaffClerkRelationDTO haveClerkCode = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
+            if (haveClerkCode != null) {
+                return resultResponse(HaoBanErrCode.ERR_10020);
+            }
+            StoreDTO store = storeService.getStore(clerk.getStoreId());
+            if (store != null) {
+                storeName = store.getStoreName();
+            }
         }
 
-        StoreDTO store = storeService.getStore(clerk.getStoreId());
         String clerkCode = clerk.getClerkCode();
         String wxEnterpriseId = staff.getWxEnterpriseId();
         String wxUserId = staff.getWxUserId();
-        StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, store.getEnterpriseId());
+        StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
 
         if (auditType == 2) {
             //无需审核
@@ -879,7 +889,7 @@ public class ClerkController extends WebBaseController {
             }
             staffClerkRelation.setClerkId(clerkId);
             staffClerkRelation.setClerkCode(clerkCode);
-            staffClerkRelation.setStoreId(clerk.getStoreId());
+            staffClerkRelation.setStoreId(storeId);
             staffClerkRelation.setEnterpriseId(clerk.getEnterpriseId());
             staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
             staffClerkRelation.setStaffId(staffId);
@@ -895,11 +905,11 @@ public class ClerkController extends WebBaseController {
             audit.setCommitStaffName(staff.getStaffName());
             audit.setCommitStaffId(staffId);
             audit.setCommitStaffImg(staff.getHeadImg());
-            audit.setCommitStoreId(clerk.getStoreId());
-            audit.setCommitStoreName(store.getStoreName());
+            audit.setCommitStoreId(storeId);
+            audit.setCommitStoreName(storeName);
             audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
             audit.setWxEnterpriseId(wxEnterpriseId);
-            audit.setEnterpriseId(store.getEnterpriseId());
+            audit.setEnterpriseId(enterpriseId);
             audit.setStatusFlag(1);
             audit.setRelatedId(clerkId);
             audit.setAuditName(staff.getStaffName());
@@ -924,11 +934,11 @@ public class ClerkController extends WebBaseController {
             audit.setCommitStaffName(staff.getStaffName());
             audit.setCommitStaffId(staffId);
             audit.setCommitStaffImg(staff.getHeadImg());
-            audit.setCommitStoreId(clerk.getStoreId());
-            audit.setCommitStoreName(store.getStoreName());
+            audit.setCommitStoreId(storeId);
+            audit.setCommitStoreName(storeName);
             audit.setAuditStatus(0);
             audit.setWxEnterpriseId(wxEnterpriseId);
-            audit.setEnterpriseId(store.getEnterpriseId());
+            audit.setEnterpriseId(enterpriseId);
             audit.setStatusFlag(1);
             audit.setRelatedId(clerkId);
 
@@ -945,7 +955,7 @@ public class ClerkController extends WebBaseController {
             audit.setAuditType(2);
             auditApiService.insert(audit);
 
-            ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
+            ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
             if (gicClerk == null) {
                 logger.info("无需发送消息");
                 return resultResponse(HaoBanErrCode.ERR_1);
@@ -956,7 +966,7 @@ public class ClerkController extends WebBaseController {
             fieldMap.put("clerkCode", clerk.getClerkCode());
 
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("storeId", clerk.getStoreId());
+            jsonObject.put("storeId", storeId);
 
             NoticeMessageUtil.sendNoticeMessage(clerk.getEnterpriseId()
                     , gicClerk.getClerkId()