Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jack 2025-09-27 19:35:37 +08:00
commit f9f7fc1688

View File

@ -790,9 +790,15 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
store_category_ids.add(storeCategory.getStore_category_id());
}
if (store_category_ids.size() > 1) {
queryWrapper.in("store_category_id", store_category_ids);
queryWrapper.and(q->{
q.in("store_category_id",store_category_ids);
q.or().in("store_2nd_category_id",store_category_ids);
});
} else {
queryWrapper.eq("store_category_id", store_category_id);
queryWrapper.or(q->{
q.eq("store_category_id",store_category_ids);
q.or().eq("store_2nd_category_id",store_category_ids);
});
}
params.put("store_category_id", store_category_id);
}