diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 2bf3718c0..8b8ae4498 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -95,6 +95,7 @@ public class WxFinanceController extends BaseController { public ResultData feesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + record.setFeesType(EnumFeesType.NOMAL.getCode()); //record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); return new ResultData(page); @@ -109,6 +110,7 @@ public class WxFinanceController extends BaseController { public ResultData advanceFeesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + record.setFeesType(EnumFeesType.ADVANCE.getCode()); //record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); return new ResultData(page);