解决扩容申请BUG

lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocShareAccepterMapper.xml

@@ -49,12 +49,12 @@
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status
         from sys_user u
         where u.del_flag = '0' and u.user_id not in (select user_id from doc_share_accepter where doc_id = #{docId})
-        <!--        <if test="userName != null and userName != ''">-->
-        <!--            AND u.user_name like concat('%', #{userName}, '%')-->
-        <!--        </if>-->
-        <!--        <if test="phonenumber != null and phonenumber != ''">-->
-        <!--            AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
-        <!--        </if>-->
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
         <!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
         <!--        ${params.dataScope}-->
     </select>

lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocSpaceExpandMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDocSpaceExpandList" parameterType="DocSpaceExpand" resultMap="DocSpaceExpandResult">
         <include refid="selectDocSpaceExpandVo"/>
         <where>  
+            <if test="spaceId != null"> and SPACE_ID=#{spaceId}</if>
             <if test="spaceName != null  and spaceName != ''"> and SPACE_NAME like concat('%', #{spaceName}, '%')</if>
             <if test="currentCap != null "> and CURRENT_CAP = #{currentCap}</if>
             <if test="expandCap != null "> and EXPAND_CAP = #{expandCap}</if>