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

fix question

release_toaliyun_real
winter 2 лет назад
Родитель
Сommit
7486b472d9
2 измененных файлов: 15 добавлений и 2 удалений
  1. +13
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxQuestionOneselfUserMapper.xml

+ 13
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller.market;

import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
@@ -146,6 +147,12 @@ public class WxQuestionOneselfController extends BaseController {
record = new WxQuestionOneselfUser();
}
record.updateTenantInfo(getTenantInfo());
if (null != record.getUserName()) {
record.setUserName(StringUtils.trimToNull(record.getUserName()));
}
if (null != record.getUserPhone()) {
record.setUserPhone(StringUtils.trimToNull(record.getUserPhone()));
}
record.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
final PageInfo<WxQuestionOneselfUser> page = wxQuestionOneselfUserService.listAsPage(record, pageNum, pageSize);
return new ResultData(page);
@@ -169,6 +176,12 @@ public class WxQuestionOneselfController extends BaseController {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
record.updateTenantInfo(getTenantInfo());
if (null != record.getUserName()) {
record.setUserName(StringUtils.trimToNull(record.getUserName()));
}
if (null != record.getUserPhone()) {
record.setUserPhone(StringUtils.trimToNull(record.getUserPhone()));
}
record.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
wxQuestionOneselfUserService.exportData(record, request, response);
}


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

@@ -37,11 +37,11 @@
and `user_id` = #{userId}
</if>

<if test=" null != userName ">
<if test=" null != userName and '' != userName">
and `user_name` like concat('%', #{userName},'%')
</if>

<if test=" null != userPhone ">
<if test=" null != userPhone and '' != userPhone">
and `user_phone` like concat('%', #{userPhone},'%')
</if>



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