成员管理分页优化

ruoyi-system/src/main/resources/mapper/branch/TBranchMemberMapper.xml

@@ -83,7 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="memberId != null "> and u.member_id = #{memberId}</if>
             <if test="userId != null "> and u.user_id = #{userId}</if>
-            <if test="memberType != null  and memberType != ''"> and u.member_type = #{memberType}</if>
+            <if test="memberType != null  and memberType != '' and memberType == 1"> and u.member_type = '1' </if>
+            <if test="memberType != null  and memberType != '' and memberType == 2"> and u.member_type in ('2', '3') </if>
+            <if test="memberType != null  and memberType != '' and memberType == 3"> and u.member_type = '3' </if>
             <if test="ethnic != null  and ethnic != ''"> and u.ethnic = #{ethnic}</if>
             <if test="staffId != null  and staffId != ''"> and u.staff_id = #{staffId}</if>
             <if test="birthday != null "> and u.birthday = #{birthday}</if>

ruoyi-ui/src/views/branch/zbjs/dymc/index.vue

@@ -487,15 +487,17 @@
       /** 查询支部成员管理列表 */
       getList() {
         this.loading = true;
+        this.queryParams.memberType = 2;
         listMember(this.queryParams).then(response => {
-          let rows = response.rows;
-          let memberList = [];
-          for (let i = 0; i < rows.length; i++) {
-            if (rows[i].memberType == "2" || rows[i].memberType == "3") {//党员、党委
-              memberList.push(rows[i]);
-            }
-          }
-          this.memberList = memberList;
+          // let rows = response.rows;
+          // let memberList = [];
+          // for (let i = 0; i < rows.length; i++) {
+          //   if (rows[i].memberType == "2" || rows[i].memberType == "3") {//党员、党委
+          //     memberList.push(rows[i]);
+          //   }
+          // }
+          // this.memberList = memberList;
+          this.memberList = response.rows;
           for (let i = 0; i < this.memberList.length; i++) {
             let posts = Array.from(this.memberList[i].posts);
             let roles = Array.from(this.memberList[i].roles);

ruoyi-ui/src/views/branch/zbjs/sqrjjfzmc/index.vue

@@ -622,15 +622,17 @@
             }
           }
           this.userList = userList;
+          this.queryParams.memberType = 1;
           listMember(this.queryParams).then(response => {
-            let rows = response.rows;
-            let memberList = [];
-            for (let i = 0; i < rows.length; i++) {
-              if (rows[i].memberType == "1") {//申请人、积极分子
-                memberList.push(rows[i]);
-              }
-            }
-            this.memberList = memberList;
+            // let rows = response.rows;
+            // let memberList = [];
+            // for (let i = 0; i < rows.length; i++) {
+            //   if (rows[i].memberType == "1") {//申请人、积极分子
+            //     memberList.push(rows[i]);
+            //   }
+            // }
+            // this.memberList = memberList;
+            this.memberList = response.rows;
             for (let i = 0; i < this.memberList.length; i++) {
               let posts = Array.from(this.memberList[i].posts);
               let roles = Array.from(this.memberList[i].roles);

ruoyi-ui/src/views/branch/zbjs/wyhmc/index.vue

@@ -489,15 +489,17 @@
       /** 查询支部成员管理列表 */
       getList() {
         this.loading = true;
+        this.queryParams.memberType = 3;
         listMember(this.queryParams).then(response => {
-          let rows = response.rows;
-          let memberList = [];
-          for (let i = 0; i < rows.length; i++) {
-            if (rows[i].memberType == "3") {//党委
-              memberList.push(rows[i]);
-            }
-          }
-          this.memberList = memberList;
+          // let rows = response.rows;
+          // let memberList = [];
+          // for (let i = 0; i < rows.length; i++) {
+          //   if (rows[i].memberType == "3") {//党委
+          //     memberList.push(rows[i]);
+          //   }
+          // }
+          // this.memberList = memberList;
+          this.memberList = response.rows;
           for (let i = 0; i < this.memberList.length; i++) {
             let posts = Array.from(this.memberList[i].posts);
             let roles = Array.from(this.memberList[i].roles);