From 2d898406d0896cf44aab54e4f7fc708112778705 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 24 Jun 2019 13:48:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E6=8A=95=E6=94=BE][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=B7=BB=E5=8A=A0id=E5=80=92=E5=8F=99,=E9=98=B2?= =?UTF-8?q?=E6=AD=A2mysql=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponChannelController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 4b264c6bf..4bbaac6e4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelStatus; @@ -24,7 +23,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.Date; -import java.util.HashMap; import java.util.Map; @RestController @@ -48,7 +46,7 @@ public class WxCouponChannelController extends BaseController { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC); PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); @@ -64,7 +62,7 @@ public class WxCouponChannelController extends BaseController { public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC); Map map = new HashedMap(); PageInfo page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize);