|
@@ -468,17 +468,17 @@
|
|
o.is_public AS "officeDTO.isPublic",
|
|
o.is_public AS "officeDTO.isPublic",
|
|
a.roster_id
|
|
a.roster_id
|
|
FROM
|
|
FROM
|
|
- sys_role AS role
|
|
|
|
- LEFT JOIN sys_user_role AS user_role ON user_role.role_id = role.id
|
|
|
|
- LEFT JOIN sys_user AS a ON a.id = user_role.user_id
|
|
|
|
|
|
+ sys_post AS post
|
|
|
|
+ LEFT JOIN sys_user_post AS user_post ON user_post.post_id = post.id
|
|
|
|
+ LEFT JOIN sys_user AS a ON a.id = user_post.user_id
|
|
AND a.del_flag = 0
|
|
AND a.del_flag = 0
|
|
LEFT JOIN sys_cert sc ON a.id = sc.user_id
|
|
LEFT JOIN sys_cert sc ON a.id = sc.user_id
|
|
AND sc.del_flag = '0'
|
|
AND sc.del_flag = '0'
|
|
LEFT JOIN sys_office c ON c.id = a.company_id
|
|
LEFT JOIN sys_office c ON c.id = a.company_id
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
WHERE
|
|
WHERE
|
|
- role.NAME = '签字注师2'
|
|
|
|
- AND role.del_flag = 0
|
|
|
|
|
|
+ post.NAME = '签字注师2'
|
|
|
|
+ AND post.del_flag = 0
|
|
</select>
|
|
</select>
|
|
<select id="findList2" resultType="com.jeeplus.sys.service.dto.UserDTO">
|
|
<select id="findList2" resultType="com.jeeplus.sys.service.dto.UserDTO">
|
|
|
|
|
|
@@ -516,23 +516,23 @@
|
|
o.is_public AS "officeDTO.isPublic",
|
|
o.is_public AS "officeDTO.isPublic",
|
|
a.roster_id
|
|
a.roster_id
|
|
FROM
|
|
FROM
|
|
- sys_role AS role
|
|
|
|
- LEFT JOIN sys_user_role AS user_role ON user_role.role_id = role.id
|
|
|
|
- LEFT JOIN sys_user AS a ON a.id = user_role.user_id
|
|
|
|
|
|
+ sys_post AS post
|
|
|
|
+ LEFT JOIN sys_user_post AS user_post ON user_post.post_id = post.id
|
|
|
|
+ LEFT JOIN sys_user AS a ON a.id = user_post.user_id
|
|
AND a.del_flag = 0
|
|
AND a.del_flag = 0
|
|
LEFT JOIN sys_cert sc ON a.id = sc.user_id
|
|
LEFT JOIN sys_cert sc ON a.id = sc.user_id
|
|
AND sc.del_flag = '0'
|
|
AND sc.del_flag = '0'
|
|
LEFT JOIN sys_office c ON c.id = a.company_id
|
|
LEFT JOIN sys_office c ON c.id = a.company_id
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
<where>
|
|
<where>
|
|
- AND role.NAME = '签字注师2'
|
|
|
|
|
|
+ AND post.NAME = '签字注师2'
|
|
<if test="id != null and id != '' ">
|
|
<if test="id != null and id != '' ">
|
|
AND a.office_id = #{id}
|
|
AND a.office_id = #{id}
|
|
</if>
|
|
</if>
|
|
<if test="loginName != null and loginName != '' ">
|
|
<if test="loginName != null and loginName != '' ">
|
|
AND a.login_name LIKE CONCAT('%', #{loginName}, '%')
|
|
AND a.login_name LIKE CONCAT('%', #{loginName}, '%')
|
|
</if>
|
|
</if>
|
|
- AND role.del_flag = 0
|
|
|
|
|
|
+ AND post.del_flag = 0
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|
|
</mapper>
|
|
</mapper>
|