diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java index 2916f7db7..f17918e59 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java @@ -53,7 +53,7 @@ public class WxCashOutController extends BaseController { if (null == wxCashOut) wxCashOut = new WxCashOut(); TenantEntity tenantInfo = getTenantInfo(); wxCashOut.updateTenantInfo(tenantInfo); - if (null != wxCashOut.getStatus() && wxCashOut.getStatus().intValue()<0) { + if (null != wxCashOut.getStatus() && wxCashOut.getStatus().intValue()>0) { //提现中 List statusList = new ArrayList(); if (wxCashOut.getStatus().intValue()==99) { @@ -83,7 +83,8 @@ public class WxCashOutController extends BaseController { wxCashOut.setStatusList(statusList); wxCashOut.setStatus(null); } - + }else { + wxCashOut.setStatus(null); } final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index f9a7140f3..b5de59531 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -82,6 +82,8 @@ public class WxCashOutController extends BaseController { wxCashOut.setStatusList(statusList); wxCashOut.setStatus(null); } + }else { + wxCashOut.setStatus(null); } final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); return new ResultData(page);