|
|
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="updateBy" column="update_by" />
|
|
|
<result property="updateTime" column="update_time" />
|
|
|
<result property="remark" column="remark" />
|
|
|
+ <result property="companyId" column="company_id" />
|
|
|
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
<collection property="roleName" ofType="java.lang.String" javaType="java.util.ArrayList">
|
|
|
@@ -48,10 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="updateBy" column="update_by" />
|
|
|
<result property="updateTime" column="update_time" />
|
|
|
<result property="remark" column="remark" />
|
|
|
+ <result property="companyId" column="company_id" />
|
|
|
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
</resultMap>
|
|
|
-
|
|
|
+
|
|
|
<resultMap id="deptResult" type="SysDept">
|
|
|
<id property="deptId" column="dept_id" />
|
|
|
<result property="parentId" column="parent_id" />
|
|
|
@@ -60,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="leader" column="leader" />
|
|
|
<result property="status" column="dept_status" />
|
|
|
</resultMap>
|
|
|
-
|
|
|
+
|
|
|
<resultMap id="RoleResult" type="SysRole">
|
|
|
<id property="roleId" column="role_id" />
|
|
|
<result property="roleName" column="role_name" />
|
|
|
@@ -69,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="dataScope" column="data_scope" />
|
|
|
<result property="status" column="role_status" />
|
|
|
</resultMap>
|
|
|
-
|
|
|
+
|
|
|
<sql id="selectUserVo">
|
|
|
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
|
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
|
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
|
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
|
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.company_id
|
|
|
from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
|
@@ -146,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<select id="selectUserListByIds" parameterType="java.util.List" resultMap="SysUserResults">
|
|
|
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,
|
|
|
u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by,
|
|
|
- u.create_time, u.remark, d.dept_name, d.leader, r.role_name
|
|
|
+ u.create_time, u.remark, d.dept_name, d.leader, r.role_name,u.company_id
|
|
|
from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join sys_user_role sur on u.user_id = sur.user_id
|
|
|
@@ -158,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
order by u.user_id
|
|
|
</select>
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResults">
|
|
|
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,r.role_name from sys_user u
|
|
|
+ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,r.role_name,u.company_id from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join sys_user_role sur on u.user_id = sur.user_id
|
|
|
left join sys_role r on r.role_id = sur.role_id
|
|
|
@@ -187,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
|
|
|
from sys_user u
|
|
|
@@ -204,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
|
|
|
from sys_user u
|
|
|
@@ -222,29 +224,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
where u.user_name = #{userName}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
where u.user_id = #{userId}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="checkUserNameUnique" parameterType="String" resultType="int">
|
|
|
select count(1) from sys_user where user_name = #{userName} limit 1
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
|
|
|
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
|
|
|
select user_id, email from sys_user where email = #{email} limit 1
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
|
|
|
insert into sys_user(
|
|
|
<if test="userId != null and userId != 0">user_id,</if>
|
|
|
@@ -259,6 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="status != null and status != ''">status,</if>
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
|
+ <if test="companyId != null">company_id,</if>
|
|
|
create_time
|
|
|
)values(
|
|
|
<if test="userId != null and userId != ''">#{userId},</if>
|
|
|
@@ -273,10 +276,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="status != null and status != ''">#{status},</if>
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
|
+ <if test="companyId != null">#{companyId},</if>
|
|
|
sysdate()
|
|
|
)
|
|
|
</insert>
|
|
|
-
|
|
|
+
|
|
|
<update id="updateUser" parameterType="SysUser">
|
|
|
update sys_user
|
|
|
<set>
|
|
|
@@ -293,32 +297,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="loginDate != null">login_date = #{loginDate},</if>
|
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
|
|
<if test="remark != null">remark = #{remark},</if>
|
|
|
+ <if test="companyId != null">company_id = #{companyId},</if>
|
|
|
update_time = sysdate()
|
|
|
</set>
|
|
|
where user_id = #{userId}
|
|
|
</update>
|
|
|
-
|
|
|
+
|
|
|
<update id="updateUserStatus" parameterType="SysUser">
|
|
|
update sys_user set status = #{status} where user_id = #{userId}
|
|
|
</update>
|
|
|
-
|
|
|
+
|
|
|
<update id="updateUserAvatar" parameterType="SysUser">
|
|
|
update sys_user set avatar = #{avatar} where user_name = #{userName}
|
|
|
</update>
|
|
|
-
|
|
|
+
|
|
|
<update id="resetUserPwd" parameterType="SysUser">
|
|
|
update sys_user set password = #{password} where user_name = #{userName}
|
|
|
</update>
|
|
|
-
|
|
|
+
|
|
|
<delete id="deleteUserById" parameterType="Long">
|
|
|
update sys_user set del_flag = '2' where user_id = #{userId}
|
|
|
</delete>
|
|
|
-
|
|
|
+
|
|
|
<delete id="deleteUserByIds" parameterType="Long">
|
|
|
update sys_user set del_flag = '2' where user_id in
|
|
|
<foreach collection="array" item="userId" open="(" separator="," close=")">
|
|
|
#{userId}
|
|
|
- </foreach>
|
|
|
+ </foreach>
|
|
|
</delete>
|
|
|
-
|
|
|
-</mapper>
|
|
|
+
|
|
|
+</mapper>
|
ct