From c1ea03d570497f64dd4c4cb94ef8f60f89a73d31 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 3 Jan 2024 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/mapper/WxUserMemberMapper.java       |  2 +-
 .../service/impl/WxUserMemberServiceImpl.java |  8 ++--
 flossom-ui/src/views/system/member/index.vue  | 48 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java
index 37ffc4a..ebd7e81 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java
@@ -74,7 +74,7 @@ public interface WxUserMemberMapper {
 
     void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id);
 
-    List<WxUserMember> selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm);
+    List<? extends WxUserMember> selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm);
 
     List<Integer> selectUserCount();
 
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
index dc38174..f91fab2 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
@@ -116,7 +116,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
      */
     @Override
     public List<WxUserMember> selectWxUserMemberList(WxUserMemberVm wxUserMemberVm) {
-        return wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
+        return (List<WxUserMember>) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
     }
 
     /**
@@ -357,8 +357,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
 
     @Override
     public List<WxUserMemberRet> selectWxUserMemberRetList(WxUserMemberVm wxUserMemberVm) {
-        List<WxUserMemberRet> list = new ArrayList<>();
-        List<WxUserMember> wxUserMembers = wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
+        List<WxUserMemberRet> wxUserMembers = (List<WxUserMemberRet>) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
         if (wxUserMembers != null && wxUserMembers.size() > 0) {
             WxUserMemberRet wxUserMemberRet;
             for (WxUserMember wxUserMember : wxUserMembers) {
@@ -370,10 +369,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
                 wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
                 wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode());
                 wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
-                list.add(wxUserMemberRet);
             }
         }
-        return list;
+        return wxUserMembers;
     }
 
     @Override
diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 1d6ed4c..ba3f9cc 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -1286,6 +1286,52 @@ export default {
       };
       this.resetForm("form");
     },
+    // 表单重置
+    resetQueryParams() {
+      // 查询参数
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        nickname: null,
+        headimg: null,
+        username: null,
+        deviceNumStart: undefined,
+        deviceNumEnd: undefined,
+        creditStart: undefined,
+        creditEnd: undefined,
+        openid: null,
+        unionid: null,
+        userType: null,
+        level: null,
+        mobile: null,
+        password: null,
+        userQr: null,
+        provinceId: null,
+        province: null,
+        cityId: null,
+        city: null,
+        areaId: null,
+        area: null,
+        birthday: null,
+        clock: null,
+        activity: null,
+        wechat: null,
+        code: null,
+        isAbutment: null,
+        collagenDay: null,
+        collagenMount: null,
+        loginTime: null,
+        status: null,
+        // createTime: [],
+        devicesName: [],  //仪器绑定
+        wecomTags: [], // 企微标签
+        miniProgramTags: [], // 小程序标签
+        purchaseChannels: [], // 购买渠道
+        isCompleteInformation: null, // 用户信息是否完善
+        wxUserRemarkList: null, // 备注列表
+      };
+      this.resetForm("queryForm");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1294,7 +1340,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm("queryForm");
+      this.resetQueryParams();
       this.handleQuery();
     },
     /** 批量操作按钮，显示批量操作弹窗 */