From 2e3b440c426eb641fa060054a70b2ea4d58374ca Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 8 Dec 2020 20:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=90=8C=E5=AD=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               | 10 +++++-----
 .../controller/custom/SysWxUserInfoController.java    |  6 +++---
 .../com/stdiet/custom/mapper/SysWxUserInfoMapper.java |  2 ++
 .../stdiet/custom/service/ISysWxUserInfoService.java  |  2 ++
 .../custom/service/impl/SysWxUserInfoServiceImpl.java |  5 +++++
 .../resources/mapper/custom/SysWxUserInfoMapper.xml   | 11 +++++++++++
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97e0c7670..83af8f9eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,20 +254,20 @@
     </pluginRepositories>
 
     <profiles>
-        <!-- dev开发环境配置,release为生产环境配置 -->
         <profile>
-            <id>dev</id>
+            <id>local</id>
             <properties>
-                <profileActive>dev</profileActive>
+                <profileActive>local</profileActive>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
+        <!-- dev开发环境配置,release为生产环境配置 -->
         <profile>
-            <id>local</id>
+            <id>dev</id>
             <properties>
-                <profileActive>local</profileActive>
+                <profileActive>dev</profileActive>
             </properties>
         </profile>
         <profile>
diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
index be3f4791f..57ea4af0b 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
@@ -144,15 +144,15 @@ public class SysWxUserInfoController extends BaseController {
     }
 
     @GetMapping("/wx/user/list")
-    public AjaxResult userList(SysWxUserInfo sysWxUserInfo) {
+    public TableDataInfo userList(SysWxUserInfo sysWxUserInfo) {
         startPage();
-        List<SysWxUserInfo> list = sysWxUserInfoService.selectSysWxUserInfoList(sysWxUserInfo);
+        List<SysWxUserInfo> list = sysWxUserInfoService.selectSysWxUserInfoListNot(sysWxUserInfo);
 
         for (SysWxUserInfo userInfo : list) {
             if (StringUtils.isNotEmpty(userInfo.getPhone())) {
                 userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
             }
         }
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java
index e2672e4e3..5173878a0 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java
@@ -27,6 +27,8 @@ public interface SysWxUserInfoMapper
      */
     public List<SysWxUserInfo> selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo);
 
+    public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo);
+
     /**
      * 新增微信用户
      *
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java
index 06f905cce..45dd721fe 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java
@@ -27,6 +27,8 @@ public interface ISysWxUserInfoService
      */
     public List<SysWxUserInfo> selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo);
 
+    public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo);
+
     /**
      * 新增微信用户
      *
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java
index f86f47d70..a1ccb0e84 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java
@@ -44,6 +44,11 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService
         return sysWxUserInfoMapper.selectSysWxUserInfoList(sysWxUserInfo);
     }
 
+    @Override
+    public List<SysWxUserInfo> selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo) {
+        return sysWxUserInfoMapper.selectSysWxUserInfoListNot(sysWxUserInfo);
+    }
+
     /**
      * 新增微信用户
      *
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
index a3331fcc0..0d594c189 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
@@ -35,6 +35,17 @@
         </where>
     </select>
 
+    <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
+        <include refid="selectSysWxUserInfoVo"/>
+        <where>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="appid != null  and appid != ''"> and appid = #{appid}</if>
+            <if test="openid != null  and openid != ''"> and openid != #{openid}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+        </where>
+    </select>
+
     <select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult">
         <include refid="selectSysWxUserInfoVo"/>
         where openid = #{openid}