diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 7ecc5d660..745ff8d05 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -65,7 +65,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 20419f2c2..121ac3ea1 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -59,7 +59,7 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setMerchantId(getUser().getMerchantId()); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index 0f1d11285..d0043be80 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -134,9 +134,15 @@ public class BaseEntity implements Serializable { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + CId_ASC("c.`id` ASC"), + CId_DESC("c.`id` DESC"), + CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), + CCreateDate_ASC("c.`create_date` ASC"), + CCreateDate_DESC("c.`create_date` DESC"), + SId_ASC("s.`id` ASC"), SId_DESC("s.`id` DESC"), @@ -146,6 +152,9 @@ public class BaseEntity implements Serializable { UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), + CCUpdateDate_ASC("cc.`update_date` ASC"), + CCUpdateDate_DESC("cc.`update_date` DESC"), + Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 0bec73408..82cfabbea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -85,7 +85,7 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); - wxCoupon.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCoupon.setSortColumns(BaseEntity.SortField.CCreateDate_DESC, BaseEntity.SortField.CId_DESC); PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null);