From f717a59e727726535235642937f62e8851cc4a67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 16:30:43 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 7a2bcf7..5c0e8fb 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -6,6 +6,7 @@
<!--@Table ba_log-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="user_name" jdbcType="VARCHAR" property="userName" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="ip" jdbcType="VARCHAR" property="ip" />
<result column="code" jdbcType="VARCHAR" property="code" />
@@ -14,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, user_id, content, dt,ip,code,msg
+ id, user_id,user_name, content, dt,ip,code,msg
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -25,9 +26,9 @@
</select>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
<!--@mbg.generated-->
- insert into ba_log (user_id, content, ip,code,msg
+ insert into ba_log (user_id,user_name, content, ip,code,msg
)
- values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
+ values (#{userId,jdbcType=BIGINT},#{userName,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
#{code,jdbcType=VARCHAR},#{msg,jdbcType=VARCHAR}
)
</insert>
@@ -37,6 +38,9 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null">
user_id,
+ </if>
+ <if test="userName != null">
+ user_name,
</if>
<if test="content != null">
content,
@@ -54,6 +58,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">
#{userId,jdbcType=BIGINT},
+ </if>
+ <if test="userName != null">
+ #{userName,jdbcType=VARCHAR},
</if>
<if test="content != null">
#{content,jdbcType=VARCHAR},
@@ -80,6 +87,9 @@
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
</if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
+ </if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
@@ -105,6 +115,9 @@
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
</if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
+ </if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
--
Gitblit v1.8.0