From 8de5484d5754ab6036c3d3a753ef49e142b299f0 Mon Sep 17 00:00:00 2001
From: elliott <382696293@qq.com>
Date: Fri, 12 Jan 2024 10:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/CtLeaveMessage.java      | 10 ++++++++++
 .../src/main/resources/mapper/CtLeaveMessageMapper.xml |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java
index f9bf24c..2122aca 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java
@@ -26,6 +26,8 @@ public class CtLeaveMessage extends BaseEntity
     @Excel(name = "来源 1-我的模块 ")
     private Integer source;
 
+    private Long userId;
+
     /** 来源名称 */
     @Excel(name = "来源名称")
     private String sourceName;
@@ -58,6 +60,14 @@ public class CtLeaveMessage extends BaseEntity
     /** 查询电话处理 */
     private String userNumberStr;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public void setId(Long id)
     {
         this.id = id;
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
index 9b4003b..4ac3d3b 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CtLeaveMessage" id="CtLeaveMessageResult">
         <result property="id"    column="id"    />
         <result property="source"    column="source"    />
+        <result property="userId"    column="user_id"    />
         <result property="sourceName"    column="source_name"    />
         <result property="userImg"    column="user_img"    />
         <result property="userNumber"    column="user_number"    />
@@ -17,13 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCtLeaveMessageVo">
-        select id, source, source_name, user_img,user_number, user_name, user_phone, message_info, create_time from ct_leave_message
+        select id,user_id, source, source_name, user_img,user_number, user_name, user_phone, message_info, create_time from ct_leave_message
     </sql>
 
     <select id="selectCtLeaveMessageList" parameterType="CtLeaveMessage" resultMap="CtLeaveMessageResult">
         <include refid="selectCtLeaveMessageVo"/>
         <where>
             <if test="source != null "> and source = #{source}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="sourceName != null  and sourceName != ''"> and source_name like concat('%', #{sourceName}, '%')</if>
             <if test="userImg != null  and userImg != ''"> and user_img = #{userImg}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
@@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCtLeaveMessage" parameterType="CtLeaveMessage" useGeneratedKeys="true" keyProperty="id">
         insert into ct_leave_message
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
             <if test="source != null">source,</if>
             <if test="sourceName != null">source_name,</if>
             <if test="userImg != null">user_img,</if>
@@ -52,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
             <if test="source != null">#{source},</if>
             <if test="sourceName != null">#{sourceName},</if>
             <if test="userImg != null">#{userImg},</if>
@@ -66,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateCtLeaveMessage" parameterType="CtLeaveMessage">
         update ct_leave_message
         <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="source != null">source = #{source},</if>
             <if test="sourceName != null">source_name = #{sourceName},</if>
             <if test="userImg != null">user_img = #{userImg},</if>