smartor.git - Gitblit

			@@ -35,7 +35,6 @@
			<result property="userType" column="user_type"/>
			<result property="searchscope" column="searchscope"/>
			<result property="guid" column="guid"/>
			<result property="orgid" column="orgid"/>
			<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
			resultMap="deptResult"/>
			<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
			@@ -89,7 +88,6 @@
			u.create_time,
			u.remark,
			u.guid,
			u.orgid,
			d.dept_id,
			d.parent_id,
			d.ancestors,
			@@ -119,11 +117,11 @@
			u.birthday,
			u.job_phone,
			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.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name from sys_user
			u
			left join sys_dept d on u.dept_id = d.dept_id
			left join sys_user_dept d on u.user_id = d.user_id
			where u.del_flag = '0'
			<if test="userId != null and userId != 0">
			<if test="userId != null">
			AND u.user_id = #{userId}
			</if>
			<if test="userName != null and userName != ''">
			@@ -171,6 +169,66 @@
			</if>
			<!-- 数据范围过滤 -->
			${params.dataScope}
			</select>
			<select id="getUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
			select u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type,
			u.nick_name, u.user_name,
			u.email,u.id_card,
			u.avatar,
			u.dept_name,
			u.dept_code,
			u.birthday,
			u.job_phone,
			u.phonenumber, u.sex, u.status,
			u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from sys_user u
			where u.del_flag = '0'
			<if test="userId != null">
			AND u.user_id = #{userId}
			</if>
			<if test="userName != null and userName != ''">
			AND u.user_name like concat('%', #{userName}, '%')
			</if>
			<if test="nickName != null and nickName != ''">
			AND u.nick_name like concat('%', #{nickName}, '%')
			</if>
			<if test="status != null and status != ''">
			AND u.status = #{status}
			</if>
			<if test="idCard != null and idCard != ''">
			AND u.id_card = #{idCard}
			</if>
			<if test="title != null and title != ''">
			AND u.title = #{title}
			</if>
			<if test="jobPhone != null and jobPhone != ''">
			AND u.job_phone = #{jobPhone}
			</if>
			<if test="birthday != null and birthday != ''">
			AND u.birthday = #{birthday}
			</if>
			<if test="deptName != null and deptName != ''">
			AND u.dept_name = #{deptName}
			</if>
			<if test="deptCode != null and deptCode != ''">
			AND u.dept_code = #{deptCode}
			</if>
			<if test="hisUserId != null and hisUserId != ''">
			AND u.his_user_id = #{hisUserId}
			</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>
			<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
			</select>

			<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
			@@ -243,18 +301,14 @@

			<select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
			<include refid="selectUserVo"/>
			<where>
			u.del_flag = '0'
			where 1=1
			AND u.del_flag = '0'
			<if test="userName != null and userName != ''">
			AND u.user_name = #{userName}
			</if>
			<if test="orgid != null and orgid != ''">
			AND u.orgid = #{orgid}
			</if>
			<if test="deptId != null and deptId != ''">
			AND u.dept_id = #{deptId}
			</if>
			</where>
			</select>

			<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
			@@ -308,7 +362,6 @@
			<if test="jobPhone != null and jobPhone != ''">job_phone,</if>
			<if test="birthday != null ">birthday,</if>
			<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
			<if test="orgid != null and orgid != ''">orgid,</if>
			<if test="deptCode != null and deptCode != ''">dept_code,</if>
			<if test="deptName != null and deptName != ''">dept_name,</if>
			create_time
			@@ -334,7 +387,6 @@
			<if test="jobPhone != null and jobPhone != ''">#{jobPhone},</if>
			<if test="birthday != null and birthday != ''">#{birthday},</if>
			<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
			<if test="orgid != null and orgid != ''">#{orgid},</if>
			<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
			<if test="deptName != null and deptName != ''">#{deptName},</if>
			sysdate()
			@@ -364,7 +416,6 @@
			<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
			<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
			<if test="birthday != null ">birthday=#{birthday},</if>
			<if test="orgid != null ">orgid=#{orgid},</if>
			<if test="title != null and title != ''">
			title = #{title},
			</if>
			@@ -398,12 +449,12 @@

			<delete id="deleteUserById" parameterType="Long">
			update sys_user
			set del_flag = '2'
			set del_flag = '1'
			where user_id = #{userId}
			</delete>

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