smartor.git - Gitblit

			@@ -25,6 +25,8 @@
			<result property="idCard" column="id_card"/>
			<result property="createTime" column="create_time"/>
			<result property="updateBy" column="update_by"/>
			<result property="deptCode" column="dept_code"/>
			<result property="deptName" column="dept_name"/>
			<result property="title" column="title"/>
			<result property="birthday" column="birthday"/>
			<result property="jobPhone" column="job_phone"/>
			@@ -68,6 +70,8 @@
			u.user_name,
			u.user_type,
			u.nick_name,
			u.dept_code,
			u.dept_name,
			u.title,
			u.his_user_id,
			u.job_phone,
			@@ -110,15 +114,20 @@
			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, 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="orgid != null and orgid != ''">
			AND u.orgid = #{orgid}
			</if>
			<if test="userName != null and userName != ''">
			AND u.user_name like concat('%', #{userName}, '%')
			@@ -140,6 +149,12 @@
			</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}
			@@ -167,6 +182,8 @@
			u.user_type,
			u.nick_name,
			u.email,
			u.dept_code,
			u.dept_name,
			u.birthday,
			u.job_phone,
			u.phonenumber, u.status,u.id_card,
			@@ -199,6 +216,8 @@
			u.email,
			u.his_user_id,
			u.title,
			u.dept_code,
			u.dept_name,
			u.job_phone,
			u.birthday,
			u.phonenumber, u.status,u.id_card,
			@@ -293,6 +312,8 @@
			<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
			)values(
			<if test="userId != null and userId != ''">#{userId},</if>
			@@ -317,6 +338,8 @@
			<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()
			)
			</insert>
			@@ -351,6 +374,8 @@
			<if test="hisUserId != null and hisUserId != ''">
			his_user_id = #{hisUserId},
			</if>
			<if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
			<if test="deptName != null and deptName != ''">dept_name=#{deptName},</if>
			update_time = sysdate()
			</set>
			where user_id = #{userId}
			@@ -376,12 +401,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>