| @@ -62,7 +62,7 @@ public class UserDataRuleAspect { | |||||
| buildingFloor = StringUtils.join(data, ","); | buildingFloor = StringUtils.join(data, ","); | ||||
| } | } | ||||
| String businessForRule = byUserId.getBusinessForRule(); | |||||
| String businessForRule = byUserId.getBusiness(); | |||||
| if (StringUtils.isNotEmpty(businessForRule)) { | if (StringUtils.isNotEmpty(businessForRule)) { | ||||
| Object[] data = JSONArray.parseArray(businessForRule).toArray(); | Object[] data = JSONArray.parseArray(businessForRule).toArray(); | ||||
| businessForRule = StringUtils.join(data, ","); | businessForRule = StringUtils.join(data, ","); | ||||
| @@ -238,10 +238,10 @@ | |||||
| inner join wx_merchant m on ms.merchant_id = m.id | inner join wx_merchant m on ms.merchant_id = m.id | ||||
| inner join wx_shop s on s.id=ms.shop_id | inner join wx_shop s on s.id=ms.shop_id | ||||
| where m.tenant_id=#{tenantId} and s.is_del=0 | where m.tenant_id=#{tenantId} and s.is_del=0 | ||||
| <if test=" null != businessForRule "> | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and m.business_id in (${businessForRule}) | and m.business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != floorForRule "> | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | |||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| ) | ) | ||||
| @@ -150,10 +150,10 @@ | |||||
| inner join wx_merchant m on ms.merchant_id = m.id | inner join wx_merchant m on ms.merchant_id = m.id | ||||
| inner join wx_shop s on s.id=ms.shop_id | inner join wx_shop s on s.id=ms.shop_id | ||||
| where m.tenant_id=#{tenantId} and s.is_del=0 | where m.tenant_id=#{tenantId} and s.is_del=0 | ||||
| <if test=" null != businessForRule "> | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and m.business_id in (${businessForRule}) | and m.business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != floorForRule "> | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | |||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| ) | ) | ||||
| @@ -149,10 +149,10 @@ | |||||
| inner join wx_merchant m on ms.merchant_id = m.id | inner join wx_merchant m on ms.merchant_id = m.id | ||||
| inner join wx_shop s on s.id=ms.shop_id | inner join wx_shop s on s.id=ms.shop_id | ||||
| where m.tenant_id=#{tenantId} and s.is_del=0 | where m.tenant_id=#{tenantId} and s.is_del=0 | ||||
| <if test=" null != businessForRule "> | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and m.business_id in (${businessForRule}) | and m.business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != floorForRule "> | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | |||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| ) | ) | ||||
| @@ -177,10 +177,10 @@ | |||||
| inner join wx_merchant m on ms.merchant_id = m.id | inner join wx_merchant m on ms.merchant_id = m.id | ||||
| inner join wx_shop s on s.id=ms.shop_id | inner join wx_shop s on s.id=ms.shop_id | ||||
| where m.tenant_id=#{tenantId} and s.is_del=0 | where m.tenant_id=#{tenantId} and s.is_del=0 | ||||
| <if test=" null != businessForRule "> | |||||
| <if test=" null != businessForRule and '' != businessForRule "> | |||||
| and m.business_id in (${businessForRule}) | and m.business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != floorForRule "> | |||||
| <if test=" null != floorForRule and '' != floorForRule "> | |||||
| and s.`floor` in (${floorForRule}) | and s.`floor` in (${floorForRule}) | ||||
| </if> | </if> | ||||
| ) | ) | ||||