| @@ -148,7 +148,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxCUserBasicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); | wxCUserBasicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); | ||||
| // wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); | |||||
| wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.wcubiActiveTime_DESC); | |||||
| PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(ifParentUpdateTenantInfo(),wxCUserBasicInfo, pageNum, pageSize); | PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(ifParentUpdateTenantInfo(),wxCUserBasicInfo, pageNum, pageSize); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| @@ -170,6 +170,9 @@ public class BaseEntity implements Serializable { | |||||
| ActiveTime_ASC("`active_time` ASC"), | ActiveTime_ASC("`active_time` ASC"), | ||||
| ActiveTime_DESC("`active_time` DESC"), | ActiveTime_DESC("`active_time` DESC"), | ||||
| wcubiActiveTime_ASC("wcubi.`active_time` ASC"), | |||||
| wcubiActiveTime_DESC("wcubi.`active_time` DESC"), | |||||
| TopTime_ASC("`top_time` ASC"), | TopTime_ASC("`top_time` ASC"), | ||||
| TopTime_DESC("`top_time` DESC"), | TopTime_DESC("`top_time` DESC"), | ||||
| @@ -123,8 +123,8 @@ | |||||
| #{idItem} | #{idItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| order by wcubi.`active_time` DESC | |||||
| <!-- <if test=" null != sortColumns">order by ${sortColumns}</if>--> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </sql> | </sql> | ||||
| @@ -221,8 +221,7 @@ | |||||
| #{idItem} | #{idItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| order by wcubi.`active_time` DESC | |||||
| <!-- <if test=" null != sortColumns">order by ${sortColumns}</if>--> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </sql> | </sql> | ||||