Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
20392816ce
3 измененных файлов: 7 добавлений и 5 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  3. +3
    -4
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 1
- 1
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<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(ifParentUpdateTenantInfo(),wxCUserBasicInfo, pageNum, pageSize);

if (page.getSize() > 0) {


+ 3
- 0
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"),



+ 3
- 4
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -123,8 +123,8 @@
#{idItem}
</foreach>
</if>
order by wcubi.`active_time` DESC
<!-- <if test=" null != sortColumns">order by ${sortColumns}</if>-->
<if test=" null != sortColumns">order by ${sortColumns}</if>

</sql>

@@ -221,8 +221,7 @@
#{idItem}
</foreach>
</if>
order by wcubi.`active_time` DESC
<!-- <if test=" null != sortColumns">order by ${sortColumns}</if>-->
<if test=" null != sortColumns">order by ${sortColumns}</if>

</sql>



Загрузка…
Отмена
Сохранить