Browse Source

[数据权限][修改][查询问题]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
94a7a7bf78
5 changed files with 9 additions and 9 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
  4. +2
    -2
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  5. +2
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java View File

@@ -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, ",");


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -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>
) )


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml View File

@@ -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>
) )


+ 2
- 2
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml View File

@@ -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>
) )


+ 2
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -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>
) )


Loading…
Cancel
Save