Browse Source

fix bug

release_toaliyun_real
winter 3 years ago
parent
commit
31d76c1c26
2 changed files with 2 additions and 2 deletions
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java View File

@@ -1,6 +1,5 @@
package com.iformall.controller.rent; package com.iformall.controller.rent;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
@@ -59,7 +58,7 @@ public class WxBillAllController extends BaseController {
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "账单总览-列表") @SystemControllerLog(description = "账单总览-列表")
public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::list:"+JSON.toJSONString(wxBillAll)+":pn"+pageNum+":ps"+pageSize);
logger.debug("[" + getIpAddr() + "] WxBillAllController::list");
wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAll.updateTenantInfo(getTenantInfo());
if (null == wxBillAll) { if (null == wxBillAll) {
wxBillAll = new WxBillAll(); wxBillAll = new WxBillAll();


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java View File

@@ -100,6 +100,7 @@ public class WxBillController extends BaseController {
logger.info("开始时间和结束时间要同时存在或不存在"); logger.info("开始时间和结束时间要同时存在或不存在");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在");
} }
logger.debug("WxBillAll:"+JSON.toJSONString(wxBillAll));
return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true); return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true);
} }




Loading…
Cancel
Save