Merge branch 'feature-haoban-role' of…

Merge branch 'feature-haoban-role' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature-haoban-role

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ClerkMainStoreRelatedServiceImpl.java

@@ -45,11 +45,17 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
 
     @Override
     public TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(String staffId, String wxEnterpriseId) {
-        return mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId,null);
+        return mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
     }
 
     @Override
     public void setMainStore(String staffId, String storeId, String wxEnterpriseId) {
+        List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listManageBindByStaffId(staffId);
+        if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
+            logger.info("区经无需设置主门店：{}", staffId);
+            return;
+        }
+
         String uuId = com.gic.haoban.common.utils.StringUtil.randomUUID();
         Date now = new Date();
         TabHaobanClerkMainStoreRelated t = new TabHaobanClerkMainStoreRelated();
@@ -67,7 +73,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         //主门店切换需要刷新企业微信好友
         TabHaobanStaff staff = staffService.selectById(staffId);
         if (staff == null) {
-            logger.info("员工不存在：{}",staffId);
+            logger.info("员工不存在：{}", staffId);
             return;
         }
         String taskName = "自动刷新企业微信好友（" + staff.getStaffName() + "）";
@@ -82,23 +88,23 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
 
     @Override
     public TabHaobanClerkMainStoreRelated getMainStoreByStaffId(String staffId, String wxEnterpriseId) {
-        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId,null);
+        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
         if (null != mainStoreRelated) {
             return mainStoreRelated;
         }
 
-        return setStaffMainStore(staffId, wxEnterpriseId,null);
+        return setStaffMainStore(staffId, wxEnterpriseId, null);
     }
 
     @Override
     public TabHaobanClerkMainStoreRelated getMainStoreByStaffId(String staffId, String wxEnterpriseId,
                                                                 List<String> storeIdList) {
-        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId,storeIdList);
+        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, storeIdList);
         if (null != mainStoreRelated) {
             return mainStoreRelated;
         }
         this.mapper.delStaffMainStore(staffId, wxEnterpriseId);
-        return setStaffMainStore(staffId, wxEnterpriseId,storeIdList);
+        return setStaffMainStore(staffId, wxEnterpriseId, storeIdList);
     }
 
     /**
@@ -108,18 +114,18 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
      * @param wxEnterpriseId
      * @return
      */
-    private TabHaobanClerkMainStoreRelated setStaffMainStore(String staffId, String wxEnterpriseId,List<String> storeIdList) {
-        List<StaffClerkRelationDTO> clerkRelationDTOS = staffClerkRelationService.listByStaffId(wxEnterpriseId, staffId,storeIdList);
+    private TabHaobanClerkMainStoreRelated setStaffMainStore(String staffId, String wxEnterpriseId, List<String> storeIdList) {
+        List<StaffClerkRelationDTO> clerkRelationDTOS = staffClerkRelationService.listByStaffId(wxEnterpriseId, staffId, storeIdList);
         if (CollectionUtils.isEmpty(clerkRelationDTOS)) {
             return null;
         }
         StaffClerkRelationDTO staffClerkRelationDTO = clerkRelationDTOS.get(0);
         String lockKey = "set-main-store:" + staffId;
         RedisUtil.lock(lockKey, 3L);
-        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId,null);
+        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
         if (null == mainStoreRelated) {
             this.setMainStore(staffId, staffClerkRelationDTO.getStoreId(), wxEnterpriseId);
-            mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId,null);
+            mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
         }
         RedisUtil.unlock(lockKey);
         return mainStoreRelated;
@@ -132,7 +138,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         //删除主门店外部联系人 好友
         externalClerkRelatedService.delByStoreIdAndStaffId(storeId, staffId);
         //设置主门店
-        return this.setStaffMainStore(staffId, wxEnterpriseId,null);
+        return this.setStaffMainStore(staffId, wxEnterpriseId, null);
     }
 
     @Override