java/xizang.git

			@@ -25,6 +25,7 @@
			<result property="remark" column="remark" />
			<result property="ifBlack" column="ifBlack" />
			<result property="districtId" column="districtId" />
			<result property="businessDeptId" column="business_dept_id" />
			<association property="dept" javaType="SysDept" resultMap="deptResult" />
			<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
			</resultMap>
			@@ -49,7 +50,7 @@
			</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, u.business_dept_id,
			d.dept_id, d.parent_id, d.ancestors, 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
			from sys_user u
			@@ -131,7 +132,7 @@
			<select id="selectUserById" parameterType="Long" 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.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, u.districtId AS districtId,u.business_dept_id AS businessDeptId,
			ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
			from sys_user u
			left join sys_user_role ur on u.user_id = ur.user_id
			@@ -224,7 +225,8 @@
			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.disable_remark AS disableRemark,
			u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
			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,
			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,u.deptName as deptName
			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,u.deptName as deptName,
			u.business_dept_id AS businessDeptId
			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
			@@ -247,6 +249,9 @@
			<foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
			#{roleId}
			</foreach>
			</if>
			<if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0">
			AND u.business_dept_id = #{query.businessDeptId}
			</if>
			ORDER BY u.create_time DESC
			</select>
			@@ -271,6 +276,7 @@
			<if test="remark != null and remark != ''">remark,</if>
			<if test="ifBlack != null">ifBlack,</if>
			<if test="districtId != null">districtId,</if>
			<if test="businessDeptId != null">business_dept_id,</if>
			create_time
			)values(
			<if test="userId != null and userId != ''">#{userId},</if>
			@@ -289,6 +295,7 @@
			<if test="remark != null and remark != ''">#{remark},</if>
			<if test="ifBlack != null">#{ifBlack},</if>
			<if test="districtId != null">#{districtId},</if>
			<if test="businessDeptId != null">#{businessDeptId},</if>
			sysdate()
			)
			</insert>
			@@ -315,6 +322,7 @@
			<if test="disableRemark != null">disable_remark = #{disableRemark},</if>
			<if test="operatingTime != null">operating_time = #{operatingTime},</if>
			<if test="operatingPerson != null">operating_person = #{operatingPerson},</if>
			<if test="businessDeptId != null">business_dept_id = #{businessDeptId},</if>
			update_time = sysdate()
			</set>
			where user_id = #{userId}