From d139ae32bfcd8c3a1ca6f64105096b93fa559bd0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 13 Oct 2020 17:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserBasicInfoController.java | 2 +- .../main/java/com/iformall/domain/po/base/BaseEntity.java | 3 +++ .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 7 +++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 25f3ab77a..359736dc3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -148,7 +148,7 @@ public class WxCUserBasicInfoController extends BaseController { } } wxCUserBasicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); -// wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); + wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.wcubiActiveTime_DESC); PageInfo page = wxCUserBasicInfoService.listAsPage(ifParentUpdateTenantInfo(),wxCUserBasicInfo, pageNum, pageSize); if (page.getSize() > 0) { 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 e0ae7d218..67e94f9f0 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 @@ -170,6 +170,9 @@ public class BaseEntity implements Serializable { ActiveTime_ASC("`active_time` ASC"), ActiveTime_DESC("`active_time` DESC"), + wcubiActiveTime_ASC("wcubi.`active_time` ASC"), + wcubiActiveTime_DESC("wcubi.`active_time` DESC"), + TopTime_ASC("`top_time` ASC"), TopTime_DESC("`top_time` DESC"), diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 74786975b..4859404e0 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -123,8 +123,8 @@ #{idItem} - order by wcubi.`active_time` DESC - + + order by ${sortColumns} @@ -221,8 +221,7 @@ #{idItem} - order by wcubi.`active_time` DESC - + order by ${sortColumns}