项目管理 用户管理 成员筛选接口修改

takai-system/src/main/resources/mapper/system/SysProjectMapper.xml

@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params != null and params.userId != null and params.isAdmin == false">
                 and sp.project_pid in (select project_pid from sys_project_staff where user_id = #{params.userId})
             </if>
+            <if test="sourceFrom != null and sourceFrom != '' ">
+                and sp.source_from = #{sourceFrom}
+            </if>
         </where>
     </select>
 

takai-system/src/main/resources/mapper/system/SysProjectStaffMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null  and roleId != ''"> and sps.role_id = #{roleId}</if>
             <if test="mBdate != null "> and sps.m_bdate <![CDATA[ >= ]]> #{mBdate}</if>
             <if test="mEdate != null "> and sps.m_edate <![CDATA[ <= ]]> #{mEdate}</if>
+            <if test="sourceFrom != null  and sourceFrom != ''"> and sp.source_from = #{sourceFrom}</if>
         </where>
     </select>
 

takai-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -86,6 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+		<if test="userType != null and userType != ''">
+			AND u.user_type = #{userType}
+		</if>
 		<!-- 数据范围过滤 -->
 		<!-- ${params.dataScope} -->
 	</select>