From 1ad3717bc0d0a41600f8bac6760a01edb921d72f Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 17:03:16 +0800 Subject: [PATCH] fix bug --- .../controller/base/BaseController.java | 6 ++++-- .../src/main/resources/mapper/WxShopMapper.xml | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index db73ec7e2..ea6d220d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -54,8 +54,8 @@ public class BaseController { public MallUserInfo getUser(){ MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); // MallUserInfo user = new MallUserInfo(); -// user.setId(321127266275430400L); -// user.setName("alitest"); +// user.setId(941561428182753280L); +// user.setName("tt01"); // user.setTenantId("789"); // user.setParentTenantId(null); return user; @@ -81,6 +81,8 @@ public class BaseController { Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); +// String tenantId = "789"; +// String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index d36bb8a05..7594b7cbf 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -277,6 +277,15 @@ and s.`point_type` = #{pointType} + + + and s.`floor` in (${floorForRule}) + + + + and s.`business_id` in (${businessForRule}) + + and s.id in @@ -321,6 +330,10 @@ and s.`floor` in (${floorForRule}) + + + and s.`business_id` in (${businessForRule}) + order by ${sortColumn} ${sortOrder} @@ -429,6 +442,10 @@ and s.`floor` in (${floorForRule}) + + + and s.`business_id` in (${businessForRule}) + and s.id in