Merge remote-tracking branch 'origin/develop_master' into develop_3

2021-10-19 16:50:06 +08:00
parent 4d1876b8c4 dba3ce87af
commit 8d522a4304
1 changed files with 4 additions and 1 deletions
@@ -50,7 +50,10 @@
        on u.usid=up.user_id
        left join ts_position p
        on up.position_id=p.id
-        where u.institution_id=#{TsUser.institutionId}
+        where 1=1
+        <if test="TsUser.institutionId != null and TsUser.institutionId != '' ">
+            and u.institution_id=#{TsUser.institutionId}
+        </if>
        <if test="TsUser.uname != null and TsUser.uname != '' ">
            and u.uname like concat('%',#{TsUser.uname},'%')
        </if>