|
|
@@ -127,7 +127,19 @@ public class PosStoreController extends BaseController {
|
|
|
String id = jwtUtil.getusid(token);
|
|
|
IPage<PosStore> stlist = new Page<>(page, size);
|
|
|
QueryWrapper<PosStore> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("user_id", id);
|
|
|
+
|
|
|
+ // 判断是否为摊位主(type=4),摊位主通过 storeId 关联摊位
|
|
|
+ InfoUser loginUser = infoUserService.selectInfoUserByUserId(Long.valueOf(id));
|
|
|
+ if ("4".equals(loginUser.getUserType())) {
|
|
|
+ if (loginUser.getStoreId() != null) {
|
|
|
+ queryWrapper.eq("id", loginUser.getStoreId());
|
|
|
+ } else {
|
|
|
+ queryWrapper.eq("id", -1); // 无关联摊位,返回空列表
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ queryWrapper.eq("user_id", id);
|
|
|
+ }
|
|
|
+
|
|
|
IPage<PosStore> list = posStoreService.page(stlist, queryWrapper);
|
|
|
if (!list.getRecords().isEmpty()) {
|
|
|
QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
|