From 1b8331bdd51c35dd7948f25c3000c981c4e9cc68 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 29 Sep 2019 16:23:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=A8=E6=88=B7=E5=90=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MallUserInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 7410bc1ec..2f3a48de0 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -36,8 +36,8 @@ and `tenant_id` = #{tenantId} - - + + and `username` like concat('%', #{username},'%') From 8d99180d79e5df336217a4bb0ecabeb2688e1c6d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 29 Sep 2019 16:29:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E6=B5=AE=E5=B1=82=E5=B9=BF=E5=91=8A][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=95=E6=94=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxFloatingLayerController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java index ad1d52c8b..96162ee9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java @@ -54,12 +54,11 @@ public class WxFloatingLayerController extends BaseController { wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); wxFloatingLayer.setTenantId(getTenantId()); try { - wxFloatingLayerService.saveOrUpdate(wxFloatingLayer); + return wxFloatingLayerService.saveOrUpdate(wxFloatingLayer); } catch (MallinkException e) { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } - return new ResultData(); } @ApiOperation("根据id更新接口") From d6c21b910c090180c5d559f08682dbd0de0a6fa7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 29 Sep 2019 16:52:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/sys/MallUserInfoController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 46e65e140..995369346 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -9,7 +9,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; -import com.iformall.enums.EnumFlowPermissionType; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; import com.iformall.shiro.UserSession; @@ -17,7 +16,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; @@ -27,7 +25,6 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -72,10 +69,6 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - if(userInfo.getWithWechatNotFormat() != null){ - userInfo.setWithWechatForQuery(userInfo.getWithWechatNotFormat()); - } - userInfo.setTenantId(getTenantId()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize);