党员名册添加预备党员

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -71,7 +71,6 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表（不分页）
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/listNoPage")
     public AjaxResult listNoPage(SysUser user)
     {

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

@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 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 == 2"> and u.member_type in ('2', '3', '5') </if>
             <if test="memberType != null  and memberType != '' and memberType == 3"> and u.member_type = '3' </if>
             <if test="memberType != null  and memberType != '' and memberType == 4"> and u.member_type = '4' </if>
             <if test="ethnic != null  and ethnic != ''"> and u.ethnic = #{ethnic}</if>