|
@@ -12,10 +12,7 @@
|
|
|
<where>
|
|
<where>
|
|
|
us.DELETE_FLAG = 'NOT_DELETE'
|
|
us.DELETE_FLAG = 'NOT_DELETE'
|
|
|
<if test="getUserStorageDTO.usernameOrNickname != null and getUserStorageDTO.usernameOrNickname != ''">
|
|
<if test="getUserStorageDTO.usernameOrNickname != null and getUserStorageDTO.usernameOrNickname != ''">
|
|
|
- (
|
|
|
|
|
- us.NAME LIKE CONCAT('/', '%', #{getUserStorageDTO.usernameOrNickname}, '%', '/')
|
|
|
|
|
- OR us.ACCOUNT LIKE CONCAT('/', '%', #{getUserStorageDTO.usernameOrNickname}, '%', '/')
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ and (us.NAME LIKE CONCAT('%', #{getUserStorageDTO.usernameOrNickname}, '%') OR us.ACCOUNT LIKE CONCAT('%', #{getUserStorageDTO.usernameOrNickname}, '%'))
|
|
|
</if>
|
|
</if>
|
|
|
<if test="getUserStorageDTO.roleId != null">
|
|
<if test="getUserStorageDTO.roleId != null">
|
|
|
and us.ID in (select re.OBJECT_ID from SYS_RELATION as re where re.CATEGORY = 'SYS_USER_HAS_ROLE' and re.TARGET_ID = #{getUserStorageDTO.roleId})
|
|
and us.ID in (select re.OBJECT_ID from SYS_RELATION as re where re.CATEGORY = 'SYS_USER_HAS_ROLE' and re.TARGET_ID = #{getUserStorageDTO.roleId})
|