diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java index 2526acc2b..7107ae4c7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java +++ b/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 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); } diff --git a/mallinkService/src/main/resources/mapper/WxQuestionOneselfUserMapper.xml b/mallinkService/src/main/resources/mapper/WxQuestionOneselfUserMapper.xml index 929a6340b..984dbdc4d 100644 --- a/mallinkService/src/main/resources/mapper/WxQuestionOneselfUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxQuestionOneselfUserMapper.xml @@ -37,11 +37,11 @@ and `user_id` = #{userId} - + and `user_name` like concat('%', #{userName},'%') - + and `user_phone` like concat('%', #{userPhone},'%')