机构管理--加筛选条件：姓名和邮箱

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -28,13 +28,19 @@
         </collection>
     </resultMap>
 
-    <select id="getUserAndPosition" resultMap="UserPosition">
+    <select id="getUserAndPosition" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
         select u.*,p.id p_id,p.name p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p
         on up.position_id=p.id
-        where u.institution_id=#{institutionId}
+        where u.institution_id=#{TsUser.institutionId}
+        <if test="TsUser.uname != null and TsUser.uname != '' ">
+            and u.uname like concat('%',#{TsUser.uname},'%')
+        </if>
+        <if test="TsUser.email != null and TsUser.email != '' ">
+            and u.email like concat('%',#{TsUser.email},'%')
+        </if>
     </select>
 
     <select id="getUserIdsByPositionIds" resultType="String">