diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 8212e798f..7e77312a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -43,7 +43,9 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + TenantEntity tenantInfo = getTenantInfo(); + wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId()); final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } @@ -121,6 +123,7 @@ public class WxCreditHistoryController extends BaseController { // wxCreditHistory.setTenantId(tenantEntity.getTenantId()); // } wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistoryService.exportData(request, response, wxCreditHistory); } @@ -136,7 +139,9 @@ public class WxCreditHistoryController extends BaseController { // }else{ // wxCreditHistory.setTenantId(tenantEntity.getTenantId()); // } - wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + TenantEntity tenantInfo = getTenantInfo(); + wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCreditHistoryService.getCreditSummary(wxCreditHistory); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 021d6f3b2..06c89c9fd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -148,6 +148,7 @@ public class WxCreditHistoryController extends BaseController { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); WxMerchantBUser bUser = getLoginBUser(); WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 86bf20909..9da453fea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -21,6 +21,17 @@ public class BaseTenantEntity extends BaseEntity { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") protected String parentTenantId; + + @TableField(exist = false) + protected String finalTenantId; + + public String getFinalTenantId() { + return finalTenantId; + } + + public void setFinalTenantId(String finalTenantId) { + this.finalTenantId = finalTenantId; + } @TableField(exist = false) @JsonProperty(access = JsonProperty.Access.READ_ONLY)