~liusheng/smartor.git

			@@ -4,7 +4,7 @@
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.ruoyi.system.mapper.BaseUserInfoMapper">

			<resultMap type="BaseUserInfo" id="BaseUserInfoResult">
			<resultMap type="com.ruoyi.system.domain.BaseUserInfo" id="BaseUserInfoResult">
			<result property="userid" column="userid" />
			<result property="usercode" column="usercode" />
			<result property="account" column="account" />
			@@ -38,10 +38,41 @@
			</resultMap>

			<sql id="selectBaseUserInfoVo">
			select userid, usercode, account, phone, password, secret, realname, nickname, roleid, rolename, deptid, deptname, wardid, wardname, usertype, usertypename, dwpermission, isopenlowerorg, isopenshareknow, isopengeneraldata, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, deptpermission, wardpermission from base_user_info
			select userid,
			usercode,
			account,
			phone,
			password,
			secret,
			realname,
			nickname,
			roleid,
			rolename,
			deptid,
			deptname,
			wardid,
			wardname,
			usertype,
			usertypename,
			dwpermission,
			isopenlowerorg,
			isopenshareknow,
			isopengeneraldata,
			orgid,
			del_flag,
			update_by,
			update_time,
			create_by,
			create_time,
			isupload,
			upload_time,
			deptpermission,
			wardpermission
			from base_user_info
			</sql>

			<select id="selectBaseUserInfoList" parameterType="BaseUserInfo" resultMap="BaseUserInfoResult">
			<select id="selectBaseUserInfoList" parameterType="com.ruoyi.system.domain.BaseUserInfo"
			resultMap="BaseUserInfoResult">
			<include refid="selectBaseUserInfoVo"/>
			<where>
			<if test="usercode != null and usercode != ''"> and usercode = #{usercode}</if>
			@@ -58,7 +89,9 @@
			<if test="wardid != null and wardid != ''"> and wardid = #{wardid}</if>
			<if test="wardname != null and wardname != ''"> and wardname like concat('%', #{wardname}, '%')</if>
			<if test="usertype != null "> and usertype = #{usertype}</if>
			<if test="usertypename != null and usertypename != ''"> and usertypename like concat('%', #{usertypename}, '%')</if>
			<if test="usertypename != null and usertypename != ''">and usertypename like concat('%', #{usertypename},
			'%')
			</if>
			<if test="dwpermission != null "> and dwpermission = #{dwpermission}</if>
			<if test="isopenlowerorg != null "> and isopenlowerorg = #{isopenlowerorg}</if>
			<if test="isopenshareknow != null "> and isopenshareknow = #{isopenshareknow}</if>
			@@ -76,7 +109,8 @@
			where userid = #{userid}
			</select>

			<insert id="insertBaseUserInfo" parameterType="BaseUserInfo" useGeneratedKeys="true" keyProperty="userid">
			<insert id="insertBaseUserInfo" parameterType="com.ruoyi.system.domain.BaseUserInfo" useGeneratedKeys="true"
			keyProperty="userid">
			insert into base_user_info
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="usercode != null">usercode,</if>
			@@ -142,7 +176,7 @@
			</trim>
			</insert>

			<update id="updateBaseUserInfo" parameterType="BaseUserInfo">
			<update id="updateBaseUserInfo" parameterType="com.ruoyi.system.domain.BaseUserInfo">
			update base_user_info
			<trim prefix="SET" suffixOverrides=",">
			<if test="usercode != null">usercode = #{usercode},</if>
			@@ -179,7 +213,9 @@
			</update>

			<delete id="deleteBaseUserInfoByUserid" parameterType="Long">
			delete from base_user_info where userid = #{userid}
			delete
			from base_user_info
			where userid = #{userid}
			</delete>

			<delete id="deleteBaseUserInfoByUserids" parameterType="String">