Merge branch 'ferture/四月迭代需求' into 'master'

设置主门店

See merge request !1208

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

@@ -563,7 +563,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
                 this.staffClerkRelationService.insert(oldRelationDTO);
                 logger.info("换门店后,查询主门店,newClerkId={}",oldRelationDTO.getStaffId());
                 // 设置主门店
-                this.clerkMainStoreRelatedService.getMainStoreByStaffId(oldRelationDTO.getStaffId(), oldRelationDTO.getWxEnterpriseId(), null) ;
+                List<StaffClerkRelationDTO> relationList = this.listByStaffId(oldRelationDTO.getWxEnterpriseId(), oldRelationDTO.getStaffId()) ;
+                List<String> storeIdList = relationList.stream().map(o->o.getStoreId()).collect(Collectors.toList()) ;
+                this.clerkMainStoreRelatedService.getMainStoreByStaffId(oldRelationDTO.getStaffId(), oldRelationDTO.getWxEnterpriseId(), storeIdList) ;
             }
         /*} else {
             String oldClerkId = oldRelationDTO.getClerkId();