Commit c36ee11405fd39aa7608d667406b5519fcbdca8f
1 parent
3a5a9e0fb8
Exists in
master
and in
1 other branch
add data import :机构、部门、用户(医生)
Showing 1 changed file with 6 additions and 8 deletions
platform-biz-service/src/main/resources/mainOrm/Users.xml
View file @
c36ee11
... | ... | @@ -218,7 +218,6 @@ |
218 | 218 | </if> |
219 | 219 | <if test="yn != null"> |
220 | 220 | and u.yn = #{yn,jdbcType=INTEGER} |
221 | --- and ur.yn = #{yn,jdbcType=INTEGER} | |
222 | 221 | </if> |
223 | 222 | <if test="type != null"> |
224 | 223 | and u.type = #{type,jdbcType=INTEGER} |
225 | 224 | |
226 | 225 | |
227 | 226 | |
228 | 227 | |
229 | 228 | |
230 | 229 | |
... | ... | @@ -235,23 +234,22 @@ |
235 | 234 | <if test="keyword != null and keyword != ''"> |
236 | 235 | and name like CONCAT(#{keyword}, '%') |
237 | 236 | </if> |
238 | - <if test="ksId != null"> | |
237 | + <if test="ksId != null and ksId != ''"> | |
239 | 238 | and u.ks_id = #{ksId,jdbcType=INTEGER} |
240 | 239 | </if> |
241 | - <if test="orgId != null"> | |
240 | + <if test="orgId != null and orgId != ''"> | |
242 | 241 | and u.org_id = #{orgId,jdbcType=INTEGER} |
243 | 242 | </if> |
244 | - <if test="deptId != null"> | |
243 | + <if test="deptId != null and deptId != ''"> | |
245 | 244 | and u.dept_id = #{deptId,jdbcType=INTEGER} |
246 | 245 | </if> |
247 | - <if test="roleId != null"> | |
246 | + <if test="roleId != null and roleId != ''"> | |
248 | 247 | and ur.role_id = #{roleId,jdbcType=INTEGER} |
249 | 248 | </if> |
250 | - <if test="yn != null"> | |
249 | + <if test="yn != null and yn != ''"> | |
251 | 250 | and u.yn = #{yn,jdbcType=INTEGER} |
252 | - -- and ur.yn = #{yn,jdbcType=INTEGER} | |
253 | 251 | </if> |
254 | - <if test="type != null"> | |
252 | + <if test="type != null and type != ''"> | |
255 | 253 | and u.type = #{type,jdbcType=INTEGER} |
256 | 254 | </if> |
257 | 255 | </select> |