排序 bug

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<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
         return new ResultData(page);

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<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
         return new ResultData(page);

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<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);