From aa771894f3eb592fe58087dcd8308df3710fd0f0 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Tue, 15 Apr 2025 14:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=88=A0=E9=99=A4=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/boot/manager/manager/entity/EvectionBean.java   | 3 +++
 .../resources/mappers/wechatData/WechatDataMapper.xml     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java
index 61a2a50..718e525 100644
--- a/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java
+++ b/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java
@@ -197,6 +197,9 @@ public class EvectionBean {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**是否同步*/
+    private String isActive;
+
     /**是否修改*/
     private String isUpdate;
     /**是否同步*/
diff --git a/src/main/resources/mappers/wechatData/WechatDataMapper.xml b/src/main/resources/mappers/wechatData/WechatDataMapper.xml
index 6f80aa1..3964977 100644
--- a/src/main/resources/mappers/wechatData/WechatDataMapper.xml
+++ b/src/main/resources/mappers/wechatData/WechatDataMapper.xml
@@ -20,7 +20,7 @@
             leave_end_interval,
         </if>
         leave_duration,examine_user_id,examine_opinion,examine_time,examine_status,host_user_id,
-        host_user_name,is_agree,location,`source`,create_user_id,create_time,update_user_id,update_time,remark,is_plateau,plateau_subsidy)
+        host_user_name,is_agree,location,`source`,create_user_id,create_time,update_user_id,update_time,remark,is_plateau,plateau_subsidy,is_active)
         values(#{id},#{uuid},#{leaveFormId},#{submitId},#{userId},#{userName},#{orgId},#{type},
         #{leaveType},#{leaveReason},
         #{leaveStartDate},
@@ -33,7 +33,7 @@
         </if>
         #{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime},
         #{examineStatus},#{hostUserId},#{hostUserName},#{isAgree},#{location},#{source},
-        #{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark},#{isPlateau},#{plateauSubsidy})
+        #{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark},#{isPlateau},#{plateauSubsidy},,#{isActive})
     </insert>
     <insert id="replaceMonthCheckList">
         <foreach collection="list" item="it" separator=";">
@@ -121,7 +121,8 @@
             update_time      = #{updateTime},
             remark           = #{remark},
             is_plateau       = #{isPlateau},
-            plateau_subsidy  = #{plateauSubsidy}
+            plateau_subsidy  = #{plateauSubsidy},
+            is_active       = #{isActive}
         WHERE id = #{id};
     </update>
 
@@ -170,7 +171,6 @@
     <select id="getWechatLeaveList" resultType="com.bonus.boot.manager.manager.entity.EvectionBean">
         select *
         from leave_apply_wechat
-        where is_active = '1'
     </select>
 
     <select id="getWechatAttList" resultType="com.bonus.boot.manager.dataPush.entity.AttSourceDataBean">