|
@@ -296,8 +296,8 @@
|
|
|
LEFT JOIN sys_organization org ON uorg.organization_id = org.id
|
|
|
LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
|
|
|
WHERE u.is_deleted = 'N' AND u.TYPE = 0
|
|
|
- <if test="userInformation.username != null">
|
|
|
- AND u.username LIKE CONCAT('%', #{userInformation.username}, '%')
|
|
|
+ <if test="userInformation.userName != null">
|
|
|
+ AND u.username LIKE CONCAT('%', #{userInformation.userName}, '%')
|
|
|
</if>
|
|
|
<if test="userInformation.autStatus != null">
|
|
|
AND aut.status = #{userInformation.autStatus}
|
|
@@ -357,8 +357,8 @@
|
|
|
<if test="userOrg.orgName != null">
|
|
|
AND org.name LIKE CONCAT('%', #{userOrg.orgName}, '%')
|
|
|
</if>
|
|
|
- <if test="userOrg.username != null">
|
|
|
- AND u.username LIKE CONCAT('%', #{userOrg.username}, '%')
|
|
|
+ <if test="userOrg.userName != null">
|
|
|
+ AND u.username LIKE CONCAT('%', #{userOrg.userName}, '%')
|
|
|
</if>
|
|
|
AND aut.status = 1
|
|
|
ORDER BY u.gmt_create DESC
|
|
@@ -388,8 +388,8 @@
|
|
|
<if test="authen.orgName != null">
|
|
|
AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
|
|
|
</if>
|
|
|
- <if test="authen.username != null">
|
|
|
- AND u.username LIKE CONCAT('%', #{authen.username}, '%')
|
|
|
+ <if test="authen.userName != null">
|
|
|
+ AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
|
|
|
</if>
|
|
|
AND aut.status = 2
|
|
|
ORDER BY u.gmt_create DESC
|