java/QYTDriving.git

			@@ -8,7 +8,7 @@
			<result column="avatar" property="avatar" />
			<result column="account" property="account" />
			<result column="password" property="password" />
			<result column="pass_word_update" property="passWordUpdate"/>
			<result column="passWordUpdate" property="passWordUpdate"/>
			<result column="salt" property="salt" />
			<result column="name" property="name" />
			<result column="birthday" property="birthday" />
			@@ -20,22 +20,26 @@
			<result column="status" property="status" />
			<result column="createtime" property="createtime" />
			<result column="version" property="version" />
			<result column="role_type" property="roleType" />
			<result column="object_id" property="objectId" />
			<result column="roleType" property="roleType" />
			<result column="objectId" property="objectId" />
			<result column="empId" property="empId" />
			<result column="enterId" property="enterId" />
			<result column="entercode" property="entercode" />
			<result column="empnew" property="empnew" />
			</resultMap>

			<sql id="Base_Column_List">
			id, account, name, birthday, sex, email, avatar,
			phone, roleid,
			deptid, status,
			createtime, version
			createtime, version,roleType,objectId,empId,enterId,entercode,empnew
			</sql>

			<sql id="Base_Column_List_With_Pwd">
			id, account, name, birthday,password, sex, email, avatar,
			phone, roleid,salt,
			deptid, status,
			createtime, version
			createtime, version,roleType,objectId,empId,enterId,entercode,empnew
			</sql>

			<select id="selectUsers" resultType="map">
			@@ -71,7 +75,7 @@
			#{userId}
			</update>

			<select id="getByAccount" resultType="user">
			<select id="getByAccount" resultType="com.stylefeng.guns.modular.system.model.User" >
			select
			<include refid="Base_Column_List_With_Pwd" />
			from sys_user where account = #{account} and status != 3