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 226e65ae2..2b5edaa6f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -67,14 +67,15 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); if(null == wxCouponChannel.getSourceType()){ wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// + }else{ + 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 c5600fef3..06a35a1eb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -60,10 +60,11 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId()); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// + }else{ + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index a6cfbdca1..fb1bcdf85 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -55,10 +55,10 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); - if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// + }else{ + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); } wxCouponChannel.setShowBeginTime(new Date()); PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);