From 84df3a9caf9bc2ffc5356fe72da19cd8ba5e9fb2 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 31 Aug 2018 10:57:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8E=92=E5=BA=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=B8=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=8E=92=E5=BA=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponChannelController.java | 2 +- .../src/main/java/com/simple/controller/WxCouponController.java | 1 + .../java/com/simple/controller/WxCouponOrderController.java | 1 + .../src/main/java/com/simple/controller/WxOrderController.java | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java index bf06fcc9a..ae2057233 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -46,7 +46,7 @@ public class WxCouponChannelController extends BaseController wxCouponChannel.setStatus(null); } wxCouponChannel.setTenantId(getUser().getTenantId()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.CreateDate_DESC); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.Id_DESC); final PageInfo page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 66c895b16..e62b9a77c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -56,6 +56,7 @@ public class WxCouponController extends BaseController public ResultData list(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); + wxCoupon.setSortColumns(WxCoupon.Field.Id_DESC); PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java index 3f992a3d1..df6a5fcea 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -35,6 +35,7 @@ public class WxCouponOrderController extends BaseController public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { if (wxCouponOrder == null) wxCouponOrder= new WxCouponOrder(); wxCouponOrder.setTenantId(getTenantId()); + wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java index 403d43c65..d7b0cbf24 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java @@ -33,6 +33,8 @@ public class WxOrderController extends BaseController }) public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { if (null == wxOrder) wxOrder = new WxOrder(); + wxOrder.setTenantId(getTenantId()); + wxOrder.setSortColumns(WxOrder.Field.Id_DESC); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); }