From eb0fbf1a926b1bc7a8e5f5355de3c1e610061fae Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 4 Jul 2020 18:00:24 +0800 Subject: [PATCH] xianfayiban --- .../controller/basic/WxShopController.java | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../com/iformall/domain/po/base/BaseEntity.java | 6 ++++++ .../resources/mapper/WxCUserBasicInfoMapper.xml | 14 +++++++------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 3d250fd55..be6b6cce8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -165,7 +165,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.updateTenantInfo(getTenantInfo()); - wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); wxShopService.exportNotRentShop(wxShop, request, response); } @@ -181,7 +181,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.updateTenantInfo(getTenantInfo()); - wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 845f69474..8c883450c 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -4,8 +4,8 @@ spring: #include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + #url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) type: com.alibaba.druid.pool.DruidDataSource 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 4a5f87706..0f1d11285 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 @@ -137,6 +137,12 @@ public class BaseEntity implements Serializable { CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), + SId_ASC("s.`id` ASC"), + SId_DESC("s.`id` DESC"), + + SCreateDate_ASC("s.`create_date` ASC"), + SCreateDate_DESC("s.`create_date` DESC"), + UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index a00fccd3d..56b7c9dc0 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -301,13 +301,13 @@