java/SmartPlatform.git

			@@ -36,6 +36,7 @@
			<result property="remark" column="remark" />
			<result property="ifBlack" column="ifBlack" />
			<result property="roleName" column="role_name" />
			<result property="deptName" column="dept_name" />
			<association property="dept" javaType="SysDept" resultMap="deptResult" />
			<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
			</resultMap>
			@@ -61,18 +62,18 @@

			<sql id="selectUserVo">
			select u.*,
			d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
			d.id as deptId,d.dept_name ,
			r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
			from sys_user u
			left join sys_dept d on u.dept_id = d.dept_id
			left join t_dept d on u.dept_id = d.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
			</sql>

			<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
			select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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,u.code from sys_user u
			left join sys_dept d on u.dept_id = d.dept_id
			u.create_by, u.create_time, u.remark, d.dept_name,u.code from sys_user u
			left join t_dept d on u.dept_id = d.id
			where u.del_flag = '0'
			<if test="userId != null and userId != 0">
			AND u.user_id = #{userId}
			@@ -170,7 +171,7 @@
			<select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
			select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
			u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.code,
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack
			from sys_user u
			WHERE u.del_flag = 0
			</select>
			@@ -186,7 +187,7 @@
			<select id="selectListByNamePhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
			select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
			u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.code,
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack
			from sys_user u
			WHERE u.del_flag = 0
			<if test="name != null and name != ''">
			@@ -234,7 +235,7 @@
			<select id="pageList" resultType="com.ruoyi.system.vo.system.SysUserVO">
			select u.*,
			r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status

			,t1.dept_name as deptName
			from sys_user u
			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
			@@ -266,7 +267,7 @@
			select * from sys_user
			where 1=1
			<if test="ids != null and ids.size()>0">
			AND deptId IN
			AND dept_id IN
			<foreach collection="ids" separator="," item="id" open="(" close=")">
			#{id}
			</foreach>
			@@ -277,7 +278,7 @@

			<select id="selectListByDeptId" resultType="com.ruoyi.common.core.domain.entity.SysUser">
			select u.*
			from sys_user u where u.deptId = #{deptId} and u.status = 0 and u.del_flag = 0
			from sys_user u where u.dept_id = #{deptId} and u.status = 0 and u.del_flag = 0
			</select>
			<select id="selectListByDeptType" resultType="com.ruoyi.common.core.domain.entity.SysUser">
			select u.*
			@@ -287,7 +288,7 @@
			select u.*
			from sys_user u where u.status = 0 and u.del_flag = 0
			<if test="projectIds != null and projectIds.size() > 0">
			and u.deptId in
			and u.dept_id in
			<foreach item="item" collection="projectIds" open="(" separator="," close=")">
			#{item}
			</foreach>
			@@ -299,7 +300,7 @@
			and deptType = #{deptType}
			</if>
			<if test="projectIds != null and projectIds.size() > 0">
			and deptId in
			and dept_id in
			<foreach item="item" collection="projectIds" open="(" separator="," close=")">
			#{item}
			</foreach>
			@@ -326,6 +327,20 @@
			</if>
			</where>
			</select>
			<select id="listByDeptId" resultType="com.ruoyi.system.vo.system.SysUserVO">
			select u.*,
			r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status
			,t1.dept_name as deptName
			from sys_user u
			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 t_dept t1 on t1.id = u.dept_id
			WHERE u.del_flag = 0
			<if test="deptId != null and query.deptId != ''">
			AND u.dept_id LIKE concat('%',#{query.deptId},'%')
			</if>
			ORDER BY u.create_time DESC
			</select>
			<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
			insert into sys_user(
			<if test="userId != null and userId != 0">user_id,</if>