From 6a8caefeb99e40b69eb034707b84cca3817b6de5 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 15:08:43 +0800 Subject: [PATCH] fix bug --- .../java/com/iformall/controller/base/BaseController.java | 7 ++++++- .../iformall/controller/WxCashBackActivityController.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 ccc7c0c8e..db73ec7e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -4,6 +4,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserDataRuleType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxUserDataRuleService; import com.iformall.shiro.UserSession; import com.iformall.utils.IPUtil; @@ -93,7 +94,11 @@ public class BaseController { } public WxUserDataRule getCurrentDataFloors() { - WxUserDataRule byUserId = wxUserDataRuleService.findByUserId(getUser().getId()); + MallUserInfo user = getUser(); + if (null != user.getIsAdmin() && user.getIsAdmin().intValue() == EnumYesOrNo.YES.getCode().intValue()) { + return null; + } + WxUserDataRule byUserId = wxUserDataRuleService.findByUserId(user.getId()); //没有配置,默认是全部权限 if (byUserId != null && EnumUserDataRuleType.ALL.getCode().intValue() == byUserId.getType().intValue()) { return null; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java index 940ec06fb..19a856144 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java @@ -107,6 +107,7 @@ public class WxCashBackActivityController extends BaseController { if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord(); TenantEntity tenantInfo = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantInfo); + wxCashBackActivityRecord.setMerchantId(getMerchantBUserId()); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); return new ResultData(page); @@ -156,6 +157,7 @@ public class WxCashBackActivityController extends BaseController { WxCashBackActivityRecord r = new WxCashBackActivityRecord(); r.setActivityId(a.getId()); r.updateTenantInfo(a); + r.setMerchantId(getMerchantBUserId()); int allRecordCount = wxCashBackActivityService.getRecordCount(r); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode());