|
|
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join sys_company c on u.company_id = c.id
|
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
|
left join sys_role r on r.role_id = ur.role_id
|
|
|
- left join sys_user_ext suse on suse.user_id = u.user_id
|
|
|
+ left join sys_user_ext suse on suse.user_id = u.user_id and suse.del_flag = '0'
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
@@ -219,7 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserByLoginName" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' and suse.del_flag ='0' GROUP BY login_name
|
|
|
+ where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserByIsManager" resultType="java.lang.String">
|
|
|
@@ -283,12 +283,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.phonenumber = #{phonenumber} and u.quit is null and u.del_flag ='0' and suse.del_flag ='0'
|
|
|
+ where u.phonenumber = #{phonenumber} and u.quit is null and u.del_flag ='0'
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.email = #{email} and u.del_flag='0' and u.quit is null and suse.del_flag ='0'
|
|
|
+ where u.email = #{email} and u.del_flag='0' and u.quit is null
|
|
|
</select>
|
|
|
|
|
|
<select id="checkLoginNameUnique" resultType="int">
|
|
|
@@ -305,7 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.user_id = #{userId} and u.del_flag='0' and u.quit is null and suse.del_flag ='0'
|
|
|
+ where u.user_id = #{userId} and u.del_flag='0' and u.quit is null
|
|
|
</select>
|
|
|
|
|
|
<delete id="deleteUserById" parameterType="Long">
|
|
|
@@ -487,7 +487,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserByEmplyeeId" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where suse.sap_employee_id = #{emplyeeId} and suse.del_flag ='0'
|
|
|
+ where suse.sap_employee_id = #{emplyeeId}
|
|
|
</select>
|
|
|
|
|
|
|