zhangshi_app_backend.git

			@@ -22,7 +22,9 @@
			<result property="createTime" column="create_time" />
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="clanId" column="clan_id" />
			<result property="remark" column="remark" />
			<result property="paid" column="paid" />
			<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
			<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
			</resultMap>
			@@ -47,7 +49,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.clan_id,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.clan_id,u.paid,
			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
			@@ -64,10 +66,43 @@
			#{id}
			</foreach>
			</select>

			<select id="selectCommonUserList" 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 from sys_user u
			left join sys_dept d on u.dept_id = d.dept_id
			where u.del_flag = '0' and u.clan_id is null and user_id !=3
			<if test="userId != null and userId != 0">
			AND u.user_id = #{userId}
			</if>
			<if test="userName != null and userName != ''">
			AND u.user_name like concat('%', #{userName}, '%')
			</if>
			<if test="status != null and status != ''">
			AND u.status = #{status}
			</if>
			<if test="phonenumber != null and phonenumber != ''">
			AND u.phonenumber like concat('%', #{phonenumber}, '%')
			</if>
			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
			AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
			</if>
			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
			AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
			</if>
			<if test="deptId != null and deptId != 0">
			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
			</if>
			<!-- 数据范围过滤 -->
			${params.dataScope}
			</select>




			<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 from sys_user u
			left join sys_dept d on u.dept_id = d.dept_id
			where u.del_flag = '0'
			where u.del_flag = '0' and u.clan_id = #{clanId}
			<if test="userId != null and userId != 0">
			AND u.user_id = #{userId}
			</if>
			@@ -94,7 +129,7 @@
			</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
			select distinct u.clan_id, 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
			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
			@@ -132,7 +167,19 @@
			<include refid="selectUserVo"/>
			where u.user_name = #{userName} and u.del_flag = '0'
			</select>


			<select id="getUserByUserName" parameterType="String" resultMap="SysUserResult">
			<include refid="selectUserVo"/>
			where u.user_name = #{userName} and u.del_flag = '0'
			</select>


			<select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
			<include refid="selectUserVo"/>
			where u.nick_name = #{nickName} and u.del_flag = '0'
			</select>


			<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
			<include refid="selectUserVo"/>
			where u.user_id = #{userId}
			@@ -141,7 +188,9 @@
			<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
			select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
			</select>

			<select id="checkNickNameUnique" parameterType="String" resultMap="SysUserResult">
			select user_id, nick_name from sys_user where nick_name = #{nickName} and del_flag = '0' limit 1
			</select>
			<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
			select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
			</select>
			@@ -162,7 +211,9 @@
			<if test="sex != null and sex != ''">sex,</if>
			<if test="password != null and password != ''">password,</if>
			<if test="status != null and status != ''">status,</if>
			<if test="createBy != null and createBy != ''">create_by,</if>
			<if test="clanId != null and clanId != 0">clan_id,</if>

			<if test="createBy != null and createBy != ''">create_by,</if>
			<if test="remark != null and remark != ''">remark,</if>
			create_time
			)values(
			@@ -176,7 +227,9 @@
			<if test="sex != null and sex != ''">#{sex},</if>
			<if test="password != null and password != ''">#{password},</if>
			<if test="status != null and status != ''">#{status},</if>
			<if test="createBy != null and createBy != ''">#{createBy},</if>
			<if test="clanId != null and clanId != ''">#{clanId},</if>

			<if test="createBy != null and createBy != ''">#{createBy},</if>
			<if test="remark != null and remark != ''">#{remark},</if>
			sysdate()
			)
			@@ -198,7 +251,8 @@
			<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>
			update_time = sysdate()
			<if test="paid != null and paid != ''">paid = #{paid},</if>
			update_time = sysdate()
			</set>
			where user_id = #{userId}
			</update>
			@@ -214,16 +268,29 @@
			<update id="resetUserPwd" parameterType="SysUser">
			update sys_user set password = #{password} where user_name = #{userName}
			</update>


			<delete id="deleteUserByUserName" parameterType="String">
			update sys_user set status = '1' where user_name= #{userName}
			</delete>
			<delete id="deleteUserByName" parameterType="String">
			delete from sys_user where user_name= #{userName}
			</delete>

			<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>
			</delete>
			update sys_user set status = '1' where user_id = #{userId}
			</delete>



			<delete id="deleteById" parameterType="Long">
			delete from sys_user where user_id = #{userId}
			</delete>

			<delete id="deleteUserByIds" parameterType="Long">
			update sys_user set status = '1' where user_id in
			<foreach collection="array" item="userId" open="(" separator="," close=")">
			#{userId}
			</foreach>
			</delete>

			</mapper>