Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !400

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

@@ -1647,7 +1647,13 @@ public class WxStaffController extends WebBaseController {
                 if(CollectionUtils.isNotEmpty(subStoreIdList)) {
                     logger.info("分页当前页storeid数={}",subStoreIdList.size());
                     String[] arr = new String[subStoreIdList.size()] ;
-                    storeDTOList = this.storeService.getStores(subStoreIdList.toArray(arr));
+                    List<StoreDTO> storeList = this.storeService.getStores(subStoreIdList.toArray(arr));
+                    Map<String,StoreDTO> storeMap = storeList.stream().collect(Collectors.toMap(StoreDTO::getStoreId, o->o,(k1,k2)->k1)) ;
+                    for(String id : subStoreIdList) {
+                        if(null != storeMap.get(id)) {
+                            storeDTOList.add(storeMap.get(id)) ;
+                        }
+                    }
                 }
             }
         }