From f41cad7761360730048065f32654052c086fd342 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 29 Jun 2023 20:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=8E=87=E5=90=8C=E6=AD=A5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bir/service/impl/BirBaseActivityServiceImpl.java | 2 +-
 .../qs/serve/modules/sys/controller/SysUserController.java   | 1 -
 src/main/resources/mapper/bir/BirBaseActivityMapper.xml      | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
index 763e9139..d2681a09 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
@@ -50,7 +50,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
             return;
         }
         //删除历史数据
-        List<Long> ids = activityList.stream().filter(a->a.getBirActId()!=null)
+        List<Long> ids = activityList.stream().filter(a->a.getId()!=null)
                 .map(TbsActivity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<BirBaseActivity> birBaseActivityLqw = new LambdaQueryWrapper<>();
         birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids);
diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
index 2ca1e22f..7fcac4a8 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
@@ -117,7 +117,6 @@ public class SysUserController {
      * (个人)登录信息
      * @return
      */
-    @LimitSubmit()
     @PostMapping("/info")
     public R<SysUserVo> info(){
         LoginUser loginUser = AuthContextUtils.getLoginUser();
diff --git a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml
index f0e37e1f..a0db4772 100644
--- a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml
+++ b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml
@@ -80,7 +80,7 @@
         tbs_activity.`create_time`,
         tbs_activity.`update_time`    </sql>
 
-    <select id="selectByBirActivity" resultType="com.qs.serve.modules.tbs.entity.TbsActivity">
+    <select id="selectByBirActivity" resultType="com.qs.serve.modules.tbs.entity.TbsActivity" resultMap="tbsActivityMap">
         SELECT
             bir_base_activity.id as bir_act_id,
             <include refid="tbsActivityScSql"/>
@@ -88,8 +88,7 @@
         LEFT JOIN bir_base_activity
             on bir_base_activity.activity_id = tbs_activity.id
         where
-             bir_base_activity.del_flag = 0
-            and tbs_activity.del_flag = 0
+            tbs_activity.del_flag = 0
             and (
                 bir_base_activity.activity_id is null
                 or bir_base_activity.activity_total_amt != tbs_activity.total_amount