Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -89,7 +89,7 @@ public interface TabHaobanStaffClerkRelationMapper {
 	
 	List<TabHaobanStaffClerkRelation>listByEnterpriseIdAndWxUserId(@Param("enterpriseId")String enterpriseId,@Param("wxUserId")String wxUserId);
 
-	List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffId")String staffId);
+	List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffId")String staffId , @Param("storeIdList") List<String> storeIdList);
 
 	TabHaobanStaffClerkRelation getByCodeAndStoreId(@Param("clerkCode")String clerkCode, @Param("storeId")String storeId);
 	

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

@@ -83,6 +83,8 @@ public interface StaffClerkRelationService {
 	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList);
 
 	List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId);
+	
+	List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId , List<String> storeIdList);
 
 	/**
 	 * 保存

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

@@ -83,7 +83,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
             return mainStoreRelated;
         }
         
-        return setStaffMainStore(staffId, wxEnterpriseId);
+        return setStaffMainStore(staffId, wxEnterpriseId,null);
     }
     
     @Override
@@ -94,7 +94,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
             return mainStoreRelated;
         }
         this.mapper.delStaffMainStore(staffId, wxEnterpriseId);
-        return setStaffMainStore(staffId, wxEnterpriseId);
+        return setStaffMainStore(staffId, wxEnterpriseId,storeIdList);
     }
 
     /**
@@ -104,7 +104,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
      * @param wxEnterpriseId
      * @return
      */
-    private TabHaobanClerkMainStoreRelated setStaffMainStore(String staffId, String wxEnterpriseId) {
+    private TabHaobanClerkMainStoreRelated setStaffMainStore(String staffId, String wxEnterpriseId,List<String> storeIdList) {
         List<StaffClerkRelationDTO> clerkRelationDTOS = staffClerkRelationService.listByStaffId(wxEnterpriseId, staffId);
         if (CollectionUtils.isEmpty(clerkRelationDTOS)) {
             return null;
@@ -128,7 +128,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         //删除主门店外部联系人 好友
         externalClerkRelatedService.delByStoreIdAndStaffId(storeId, staffId);
         //设置主门店
-        return this.setStaffMainStore(staffId, wxEnterpriseId);
+        return this.setStaffMainStore(staffId, wxEnterpriseId,null);
     }
 
     @Override

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

@@ -239,7 +239,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId));
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId , null));
+    }
+    
+    @Override
+    public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId, List<String> storeIdList) {
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId , storeIdList));
     }
 
     @Override