From 4afa387b237899d5f841a3070d04739772c22551 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 11:17:47 +0800
Subject: [PATCH] 规范二维码生成

---
 pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 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 7ec9208..eb61a0b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -24,54 +24,65 @@
     from ba_log
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
+  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoBa.BaLog">
     <!--@mbg.generated-->
-    insert into ba_log (user_id,user_name, content, ip,code,msg
+    insert into ba_log (id, user_id,user_name, content, ip,code,msg
       )
-    values (#{userId,jdbcType=BIGINT},#{userName,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
-    #{code,jdbcType=VARCHAR},#{msg,jdbcType=VARCHAR}
+    values (#{id,jdbcType=BIGINT},
+    #{userId,jdbcType=BIGINT},
+    #{userName,jdbcType=VARCHAR},
+    #{content,jdbcType=VARCHAR},
+    #{ip,jdbcType=VARCHAR},
+    #{code,jdbcType=VARCHAR},
+    #{msg,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
+  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoBa.BaLog">
     <!--@mbg.generated-->
     insert into ba_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="userId != null">
         user_id,
       </if>
-      <if test="userName != null">
+      <if test="userName != null and userName !=''">
         user_name,
       </if>
-      <if test="content != null">
+      <if test="content != null and content !=''">
         content,
       </if>
-      <if test="code != null">
+      <if test="code != null and code !=''">
         code,
       </if>
-      <if test="msg != null">
+      <if test="msg != null and msg !=''">
         msg,
       </if>
-      <if test="ip != null">
+      <if test="ip != null and ip !=''">
         ip,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
       <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
-      <if test="userName != null">
+      <if test="userName != null and userName !=''">
         #{userName,jdbcType=VARCHAR},
       </if>
-      <if test="content != null">
+      <if test="content != null and content !=''">
         #{content,jdbcType=VARCHAR},
       </if>
-      <if test="code != null">
+      <if test="code != null and code !=''">
         #{code,jdbcType=VARCHAR},
       </if>
-      <if test="msg != null">
+      <if test="msg != null and msg !=''">
         #{msg,jdbcType=VARCHAR},
       </if>
-      <if test="ip != null">
+      <if test="ip != null and ip !=''">
         #{ip,jdbcType=VARCHAR},
       </if>
     </trim>
@@ -79,12 +90,10 @@
 
   <select id="selectSome" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" >
-      <property name="alias" value="r"/>
-    </include>
+    <include refid="Base_Column_List" />
     from ba_log r
     <trim prefix="where " suffixOverrides="and">
-      <if test="userId != null and userId != ''">
+      <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT} and
       </if>
       <if test="userName != null and userName != ''">
@@ -93,7 +102,7 @@
       <if test="content != null  and content != '' ">
         content like concat('%', #{content}, '%') and
       </if>
-      <if test="dt != null and dt != '' ">
+      <if test="dt != null">
         DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
       </if>
       <if test="ip != null and ip != '' ">
@@ -112,7 +121,7 @@
     select count(1)
     from ba_log r
     <trim prefix="where " suffixOverrides="and">
-      <if test="userId != null and userId != ''">
+      <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT} and
       </if>
       <if test="userName != null and userName != ''">
@@ -121,7 +130,7 @@
       <if test="content != null  and content != '' ">
         content like concat('%', #{content}, '%') and
       </if>
-      <if test="dt != null and dt != '' ">
+      <if test="dt != null">
         DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
       </if>
       <if test="ip != null and ip != '' ">

--
Gitblit v1.8.0