From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/ShamUserMapper.xml |  274 +++++++++++++++++++++++++++---------------------------
 1 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ShamUserMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ShamUserMapper.xml
index 4c5f564..39b8a59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ShamUserMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ShamUserMapper.xml
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.user.ShamUserMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.ShamUser">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="name" property="name" jdbcType="VARCHAR" />
-		<result column="picUrl" property="picUrl" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">id,name,picUrl</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_sham_user where id = #{id,jdbcType=BIGINT}
-	</select>
-
-	<select id="listAll" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_sham_user
-	</select>
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_sham_user where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sham_user
-		(id,name,picUrl) values
-		(#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picUrl,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_sham_user
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="name != null">name,</if>
-			<if test="picUrl != null">picUrl,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
-			<if test="picUrl != null">#{picUrl,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser">update
-		yeshi_ec_sham_user set name = #{name,jdbcType=VARCHAR},picUrl =
-		#{picUrl,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser">
-		update yeshi_ec_sham_user
-		<set>
-			<if test="name != null">name=#{name,jdbcType=VARCHAR},</if>
-			<if test="picUrl != null">picUrl=#{picUrl,jdbcType=VARCHAR},</if>
-		</set>
-		where id = #{id,jdbcType=BIGINT}
-	</update>
-
-	<insert id="insertBatch" useGeneratedKeys="true" keyProperty="id"
-		parameterType="java.util.List">
-		insert into yeshi_ec_sham_user
-		(
-		<include refid="Base_Column_List" />
-		) values
-		<foreach collection="list" item="item" separator=",">
-			(
-			#{item.id,jdbcType=BIGINT},
-			#{item.name,jdbcType=VARCHAR},
-			#{item.picUrl,jdbcType=VARCHAR}
-			)
-		</foreach>
-	</insert>
-
-	<update id="updateBatchSelective" parameterType="java.util.List">
-		update yeshi_ec_sham_user
-		<trim prefix="set" suffixOverrides=",">
-			<trim prefix="name =case" suffix="end,">
-				<foreach collection="list" item="item" index="index">
-					<if test="item.name !=null">
-						when id=#{item.id} then #{item.name}
-					</if>
-				</foreach>
-			</trim>
-			<trim prefix="picUrl =case" suffix="end,">
-				<foreach collection="list" item="item" index="index">
-					<if test="item.picUrl !=null">
-						when id=#{item.id} then #{item.picUrl}
-					</if>
-				</foreach>
-			</trim>
-		</trim>
-		where id in
-		<foreach collection="list" index="index" item="item"
-			separator="," open="(" close=")">
-			#{item.id,jdbcType=BIGINT}
-		</foreach>
-	</update>
-
-	<select id="listShamUserByKey" resultMap="BaseResultMap">
-		<!-- 鏍规嵁鏉′欢鏌ヨ鎵�鏈夋爣绛� -->
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM yeshi_ec_sham_user
-		WHERE 1=1
-		<if test='key != null and key != ""'>
-			AND (id like '%${key}%' OR name like '%${key}%')
-		</if>
-		ORDER BY id DESC
-		LIMIT ${start},${count}
-	</select>
-
-	<select id="countShamUserByKey" resultType="java.lang.Long">
-		SELECT count(id) FROM yeshi_ec_sham_user
-		WHERE 1=1
-		<if test='key != null and key != ""'>
-			AND (id like '%${key}%' OR name like '%${key}%')
-		</if>
-	</select>
-
-
-	<select id="listByDistinctPicUrl" resultMap="BaseResultMap">
-		SELECT B.* FROM
-		(SELECT DISTINCT(f.`picUrl`),f.`id` FROM `yeshi_ec_sham_user` f ORDER
-		BY id DESC
-		LIMIT ${start},${count})A
-		LEFT JOIN yeshi_ec_sham_user B ON
-		A.id = B.id
-	</select>
-
-	<select id="listRand" resultMap="BaseResultMap">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM yeshi_ec_sham_user ORDER BY RAND() LIMIT #{count}
-	</select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.user.ShamUserMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.ShamUser">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="picUrl" property="picUrl" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">id,name,picUrl</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_sham_user where id = #{id,jdbcType=BIGINT}
+	</select>
+
+	<select id="listAll" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_sham_user
+	</select>
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_sham_user where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sham_user
+		(id,name,picUrl) values
+		(#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picUrl,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_sham_user
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="name != null">name,</if>
+			<if test="picUrl != null">picUrl,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
+			<if test="picUrl != null">#{picUrl,jdbcType=VARCHAR},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser">update
+		yeshi_ec_sham_user set name = #{name,jdbcType=VARCHAR},picUrl =
+		#{picUrl,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.ShamUser">
+		update yeshi_ec_sham_user
+		<set>
+			<if test="name != null">name=#{name,jdbcType=VARCHAR},</if>
+			<if test="picUrl != null">picUrl=#{picUrl,jdbcType=VARCHAR},</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+
+	<insert id="insertBatch" useGeneratedKeys="true" keyProperty="id"
+		parameterType="java.util.List">
+		insert into yeshi_ec_sham_user
+		(
+		<include refid="Base_Column_List" />
+		) values
+		<foreach collection="list" item="item" separator=",">
+			(
+			#{item.id,jdbcType=BIGINT},
+			#{item.name,jdbcType=VARCHAR},
+			#{item.picUrl,jdbcType=VARCHAR}
+			)
+		</foreach>
+	</insert>
+
+	<update id="updateBatchSelective" parameterType="java.util.List">
+		update yeshi_ec_sham_user
+		<trim prefix="set" suffixOverrides=",">
+			<trim prefix="name =case" suffix="end,">
+				<foreach collection="list" item="item" index="index">
+					<if test="item.name !=null">
+						when id=#{item.id} then #{item.name}
+					</if>
+				</foreach>
+			</trim>
+			<trim prefix="picUrl =case" suffix="end,">
+				<foreach collection="list" item="item" index="index">
+					<if test="item.picUrl !=null">
+						when id=#{item.id} then #{item.picUrl}
+					</if>
+				</foreach>
+			</trim>
+		</trim>
+		where id in
+		<foreach collection="list" index="index" item="item"
+			separator="," open="(" close=")">
+			#{item.id,jdbcType=BIGINT}
+		</foreach>
+	</update>
+
+	<select id="listShamUserByKey" resultMap="BaseResultMap">
+		<!-- 鏍规嵁鏉′欢鏌ヨ鎵�鏈夋爣绛� -->
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM yeshi_ec_sham_user
+		WHERE 1=1
+		<if test='key != null and key != ""'>
+			AND (id like '%${key}%' OR name like '%${key}%')
+		</if>
+		ORDER BY id DESC
+		LIMIT ${start},${count}
+	</select>
+
+	<select id="countShamUserByKey" resultType="java.lang.Long">
+		SELECT count(id) FROM yeshi_ec_sham_user
+		WHERE 1=1
+		<if test='key != null and key != ""'>
+			AND (id like '%${key}%' OR name like '%${key}%')
+		</if>
+	</select>
+
+
+	<select id="listByDistinctPicUrl" resultMap="BaseResultMap">
+		SELECT B.* FROM
+		(SELECT DISTINCT(f.`picUrl`),f.`id` FROM `yeshi_ec_sham_user` f ORDER
+		BY id DESC
+		LIMIT ${start},${count})A
+		LEFT JOIN yeshi_ec_sham_user B ON
+		A.id = B.id
+	</select>
+
+	<select id="listRand" resultMap="BaseResultMap">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM yeshi_ec_sham_user ORDER BY RAND() LIMIT #{count}
+	</select>
+
+</mapper>

--
Gitblit v1.8.0