Merge remote-tracking branch 'origin/develop_1' into develop_1

2021-09-26 13:48:47 +08:00
parent 8e2d3c7697 30c2b5de44
commit 22027d9e7c
4 changed files with 32 additions and 2 deletions
@@ -51,6 +51,12 @@
        left join ts_position p
        on up.position_id=p.id
        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">