Commit 54470b0b16d9e0932c2c916d7a104358fab435ba

Authored by rui.zhang

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/resources/mainOrm/Departments.xml View file @ 54470b0
... ... @@ -135,7 +135,7 @@
135 135 <if test="keyword != null and keyword != ''">
136 136 and name like CONCAT(#{keyword}, '%')
137 137 </if>
138   - <if test="orgList != null">
  138 + <if test="orgList != null and orgList.size() > 0">
139 139 and org_id in
140 140 <foreach collection="orgList" index="index" item="item" open="(" separator="," close=")">
141 141 #{item}
platform-biz-service/src/main/resources/mainOrm/Organization.xml View file @ 54470b0
... ... @@ -171,7 +171,7 @@
171 171 <if test="keyword != null and keyword != ''">
172 172 and name like CONCAT(#{keyword}, '%')
173 173 </if>
174   - <if test="typeList != null">
  174 + <if test="typeList != null and typeList.size() > 0">
175 175 and type in
176 176 <foreach collection="typeList" index="index" item="item" open="(" separator="," close=")">
177 177 #{item}