pipIrr-SV.git - Gitblit

			@@ -269,7 +269,7 @@
			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
			@@ -291,7 +291,7 @@
			<!--根据指定条件获取用户列表-->
			<select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
			SELECT
			CAST(id AS char) AS userId,
			CAST(id AS char) AS id,
			phone,
			name AS userName,
			disabled AS stateId,
			@@ -302,7 +302,7 @@
			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
			@@ -343,4 +343,12 @@
			WHERE userId = ${userId}

			</select>

			<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
			<!--@mbg.generated-->
			select
			<include refid="Base_Column_List" />
			from ba_user
			where id = #{id,jdbcType=BIGINT}
			</select>
			</mapper>