java/gy_jifenshangcheng.git

			@@ -52,6 +52,7 @@
			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.role_type, u.create_by, u.create_time, u.remark,
			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.data_scope, r.status as role_status ,u.role_type as roleType,u.objectId AS objectId
			,u.site_id as siteId
			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
			@@ -217,6 +218,7 @@
			<if test="remark != null and remark != ''">remark,</if>
			<if test="objectId != null and objectId != ''">objectId,</if>
			<if test="appUserId != null and appUserId != ''">app_user_id,</if>
			<if test="siteId != null and siteId != ''">site_id,</if>
			create_time
			)values(
			<if test="userId != null and userId != ''">#{userId},</if>
			@@ -234,6 +236,7 @@
			<if test="remark != null and remark != ''">#{remark},</if>
			<if test="objectId != null and objectId != ''">#{objectId},</if>
			<if test="appUserId != null and appUserId != ''">#{appUserId},</if>
			<if test="siteId != null and siteId != ''">#{siteId},</if>
			sysdate()
			)
			</insert>
			@@ -257,6 +260,8 @@
			<if test="forbiddenRemark != null">forbidden_remark = #{forbiddenRemark},</if>
			<if test="roleType != null">role_type = #{roleType},</if>
			<if test="objectId != null">objectId = #{objectId},</if>
			<if test="siteId != null">site_id = #{siteId},</if>
			<if test="integral != null">integral = #{integral},</if>
			update_time = sysdate()
			</set>
			where user_id = #{userId}