| @@ -54,8 +54,8 @@ public class BaseController { | |||||
| public MallUserInfo getUser(){ | public MallUserInfo getUser(){ | ||||
| MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| // MallUserInfo user = new MallUserInfo(); | // MallUserInfo user = new MallUserInfo(); | ||||
| // user.setId(321127266275430400L); | |||||
| // user.setName("alitest"); | |||||
| // user.setId(941561428182753280L); | |||||
| // user.setName("tt01"); | |||||
| // user.setTenantId("789"); | // user.setTenantId("789"); | ||||
| // user.setParentTenantId(null); | // user.setParentTenantId(null); | ||||
| return user; | return user; | ||||
| @@ -81,6 +81,8 @@ public class BaseController { | |||||
| Session session = SecurityUtils.getSubject().getSession(); | Session session = SecurityUtils.getSubject().getSession(); | ||||
| String tenantId = (String)session.getAttribute(UserSession.tenantId); | String tenantId = (String)session.getAttribute(UserSession.tenantId); | ||||
| String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | ||||
| // String tenantId = "789"; | |||||
| // String parentTenantId = null; | |||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -277,6 +277,15 @@ | |||||
| <if test=" null != pointType "> | <if test=" null != pointType "> | ||||
| and s.`point_type` = #{pointType} | and s.`point_type` = #{pointType} | ||||
| </if> | </if> | ||||
| <if test=" null != floorForRule and '' != floorForRule "> | |||||
| and s.`floor` in (${floorForRule}) | |||||
| </if> | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and s.`business_id` in (${businessForRule}) | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and s.id in | and s.id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -321,6 +330,10 @@ | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | <if test=" null != floorForRule and '' != floorForRule "> | ||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and s.`business_id` in (${businessForRule}) | |||||
| </if> | |||||
| <if test="null != sortColumn"> | <if test="null != sortColumn"> | ||||
| order by ${sortColumn} ${sortOrder} | order by ${sortColumn} ${sortOrder} | ||||
| @@ -429,6 +442,10 @@ | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | <if test=" null != floorForRule and '' != floorForRule "> | ||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and s.`business_id` in (${businessForRule}) | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and s.id in | and s.id in | ||||