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/SystemConfigMapper.xml | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemConfigMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemConfigMapper.xml
index 3239cc2..51a6419 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemConfigMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemConfigMapper.xml
@@ -1,57 +1,57 @@
-<?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.SystemConfigMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.SystemConfig">
- <id column="id" property="id" jdbcType="BIGINT"/>
- <result column="key" property="key" jdbcType="VARCHAR"/>
- <result column="value" property="value" jdbcType="VARCHAR"/>
- <result column="name" property="name" jdbcType="VARCHAR"/>
- <result column="updatetime" property="updatetime" jdbcType="BIGINT"/>
- </resultMap>
- <sql id="Base_Column_List">id,`key`,`value`,`name`,updatetime</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
- <include refid="Base_Column_List"/>from yeshi_ec_system_config where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_system_config where id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemConfig" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_config (id,`key`,`value`,`name`,updatetime) values (#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{updatetime,jdbcType=BIGINT})</insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemConfig" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_config
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="key != null">`key`,</if>
- <if test="value != null">`value`,</if>
- <if test="name != null">`name`,</if>
- <if test="updatetime != null">updatetime,</if>
- </trim>values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="key != null">#{key,jdbcType=VARCHAR},</if>
- <if test="value != null">#{value,jdbcType=VARCHAR},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="updatetime != null">#{updatetime,jdbcType=BIGINT},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemConfig">update yeshi_ec_system_config set `key` = #{key,jdbcType=VARCHAR},`value` = #{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},updatetime = #{updatetime,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}</update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemConfig">update yeshi_ec_system_config
- <set>
- <if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
- <if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
- <if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
- <if test="updatetime != null">updatetime=#{updatetime,jdbcType=BIGINT},</if>
- </set> where id = #{id,jdbcType=BIGINT}
- </update>
-
- <select id="getByKey" resultMap="BaseResultMap">
- SELECT * FROM yeshi_ec_system_config t
- WHERE t.`key` = #{key}
- LIMIT 1
- </select>
-
- <select id="getByKeyAndSystemId" resultMap="BaseResultMap">
- SELECT * FROM yeshi_ec_system_config t
- LEFT JOIN `yeshi_ec_system_systemconfig` g ON g.`scid` = t.`id`
- WHERE t.`key` = #{key} AND g.`sid` = #{systemId}
- LIMIT 1
- </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.SystemConfigMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.SystemConfig">
+ <id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="key" property="key" jdbcType="VARCHAR"/>
+ <result column="value" property="value" jdbcType="VARCHAR"/>
+ <result column="name" property="name" jdbcType="VARCHAR"/>
+ <result column="updatetime" property="updatetime" jdbcType="BIGINT"/>
+ </resultMap>
+ <sql id="Base_Column_List">id,`key`,`value`,`name`,updatetime</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+ <include refid="Base_Column_List"/>from yeshi_ec_system_config where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_system_config where id = #{id,jdbcType=BIGINT}</delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemConfig" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_config (id,`key`,`value`,`name`,updatetime) values (#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{updatetime,jdbcType=BIGINT})</insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemConfig" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_config
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="key != null">`key`,</if>
+ <if test="value != null">`value`,</if>
+ <if test="name != null">`name`,</if>
+ <if test="updatetime != null">updatetime,</if>
+ </trim>values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="key != null">#{key,jdbcType=VARCHAR},</if>
+ <if test="value != null">#{value,jdbcType=VARCHAR},</if>
+ <if test="name != null">#{name,jdbcType=VARCHAR},</if>
+ <if test="updatetime != null">#{updatetime,jdbcType=BIGINT},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemConfig">update yeshi_ec_system_config set `key` = #{key,jdbcType=VARCHAR},`value` = #{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},updatetime = #{updatetime,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemConfig">update yeshi_ec_system_config
+ <set>
+ <if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
+ <if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
+ <if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
+ <if test="updatetime != null">updatetime=#{updatetime,jdbcType=BIGINT},</if>
+ </set> where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <select id="getByKey" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_system_config t
+ WHERE t.`key` = #{key}
+ LIMIT 1
+ </select>
+
+ <select id="getByKeyAndSystemId" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_system_config t
+ LEFT JOIN `yeshi_ec_system_systemconfig` g ON g.`scid` = t.`id`
+ WHERE t.`key` = #{key} AND g.`sid` = #{systemId}
+ LIMIT 1
+ </select>
+
+</mapper>
--
Gitblit v1.8.0