xhxu 5 лет назад
Родитель
Сommit
4d397489be
3 измененных файлов: 19 добавлений и 2 удалений
  1. +7
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java

+ 7
- 2
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<WxCreditHistoryVo> 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);
}



+ 1
- 0
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) {


+ 11
- 0
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)


Загрузка…
Отмена
Сохранить