pipIrr-SV.git - Gitblit

			@@ -6,21 +6,23 @@
			<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
			<!--@mbg.generated-->
			<!--@Table ba_user-->
			<id property="userId" column="id" />
			<id property="id" column="id" />
			<result property="blockId" column="blockId"/>
			<result property="userName" column="name"/>
			<result property="phone" column="phone"/>
			<result property="password" column="password"/>
			<result property="orgTag" column="orgTag"/>
			<result property="supperAdmin" column="supperAdmin"/>
			<result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
			<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
			<result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
			javaType="com.dy.common.mybatis.envm.Disabled"/>
			<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
			javaType="com.dy.common.mybatis.envm.Deleted"/>
			</resultMap>

			<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
			<!--@mbg.generated-->
			<!--@Table ba_user-->
			<id property="userId" column="id" />
			<id property="id" column="id" />
			<result property="userName" column="name"/>
			<result property="phone" column="phone"/>
			<result property="orgTag" column="orgTag"/>
			@@ -29,7 +31,7 @@
			</resultMap>

			<resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
			<id property="userId" column="id" />
			<id property="id" column="id" />
			<result property="blockId" column="blockId"/>
			<result property="userName" column="name"/>
			<result property="phone" column="phone"/>
			@@ -99,8 +101,9 @@
			</trim>
			</select>
			<insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
			insert into ba_user (<include refid="Base_Column_List" />)
			values (#{userId,jdbcType=BIGINT},
			<!-- insert into ba_user (<include refid="Base_Column_List" />)-->
			insert into ba_user(id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted)
			values (#{id,jdbcType=BIGINT},
			#{blockId,jdbcType=BIGINT},
			#{userName,jdbcType=VARCHAR},
			#{phone,jdbcType=VARCHAR},
			@@ -114,7 +117,7 @@
			<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
			insert into ba_user
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="userId != null">
			<if test="id != null">
			id,
			</if>
			<if test="blockId != null">
			@@ -143,8 +146,8 @@
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="userId != null">
			#{userId,jdbcType=BIGINT},
			<if test="id != null">
			#{id,jdbcType=BIGINT},
			</if>
			<if test="blockId != null">
			#{blockId,jdbcType=BIGINT},
			@@ -195,7 +198,7 @@
			deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
			</if>
			</set>
			where id = #{userId, jdbcType=BIGINT}
			where id = #{id, jdbcType=BIGINT}
			</update>
			<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
			update ba_user
			@@ -205,7 +208,7 @@
			password = #{password,jdbcType=VARCHAR},
			disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
			deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
			where id = #{userId,jdbcType=BIGINT}
			where id = #{id,jdbcType=BIGINT}
			</update>
			<update id="changePassword" >
			update ba_user
			@@ -245,14 +248,18 @@
			<!--根据用户编号获取用户信息-->
			<select id="getUserInfoById" resultType="java.util.Map">
			SELECT
			id AS userId,
			name AS userName
			FROM ba_user
			us.id AS userId,
			us.name AS userName,
			us.phone,
			IFNULL(us.blockId, 0) AS blockId,
			IFNULL(blo.name, 0) AS blockName
			FROM ba_user us
			LEFT JOIN ba_block blo ON us.blockId = blo.id
			<where>
			AND disabled = 0
			AND deleted = 0
			AND us.disabled = 0
			AND us.deleted = 0
			<if test = "userId != null and userId > 0">
			AND ba_user.id = ${userId}
			AND us.id = ${userId}
			</if>
			</where>
			</select>
			@@ -262,13 +269,13 @@
			SELECT
			COUNT(*) AS recordCount
			FROM ba_user user
			INNER JOIN ba_user_role usro ON usro.userId = user.id
			<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
			<where>
			AND user.supperAdmin != 1
			AND user.deleted = 0

			<if test = "name != null and name !=''">
			AND user.name like CONCAT('%',#{name},'%')
			<if test = "userName != null and userName !=''">
			AND user.name like CONCAT('%',#{userName},'%')
			</if>

			<if test = "phone != null and phone !=''">
			@@ -295,13 +302,13 @@
			CAST(blockId AS char) AS blockId,
			(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
			FROM ba_user user
			INNER JOIN ba_user_role usro ON usro.userId = user.id
			<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
			<where>
			AND user.supperAdmin != 1
			AND user.deleted = 0

			<if test = "name != null and name !=''">
			AND user.name like CONCAT('%',#{name},'%')
			<if test = "userName != null and userName !=''">
			AND user.name like CONCAT('%',#{userName},'%')
			</if>

			<if test = "phone != null and phone !=''">
			@@ -313,9 +320,11 @@
			</if>
			</where>
			ORDER BY user.id DESC
			<if test="pageCurr != null and pageSize != null">
			LIMIT ${pageCurr}, ${pageSize}
			</if>
			<trim prefix="limit " >
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			</if>
			</trim>
			</select>

			<!--根据用户编号获取角色ID列表-->