From 4b3d076a23c6158dfde5e4d1f909bea3134a99f4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Aug 2022 10:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AD=BE=E5=88=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partyOrg/service/impl/IcPartyActServiceImpl.java      | 8 +++++++-
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml  | 1 +
 .../main/resources/mapper/partyOrg/IcPartyActOrgDao.xml   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index 07c6942eec..7c728bd892 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -84,7 +84,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     private IcPartyActTypeDictService partyActTypeDictService;
     @Autowired
     private IcPartyMemberDao icPartyMemberDao;
-
+    @Autowired
+    private IcPartyActSignInRecordDao icPartyActSignInRecordDao;
 
     /**
      * 活动类型列表
@@ -649,8 +650,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
         icPartyActIds.forEach(icPartyActId->{
             //删除活动主表和参与活动党组织关系表记录
+            //只有本人发布的活动才可以删除
             baseDao.deleteIcPartyAct(customerId,userId,icPartyActId);
             icPartyActOrgDao.updateToDel(userId,icPartyActId);
+            //删除签到记录
+            LambdaQueryWrapper<IcPartyActSignInRecordEntity> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId);
+            icPartyActSignInRecordDao.delete(queryWrapper);
         });
 
     }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index e37644645a..ea2a3ccb8b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -204,6 +204,7 @@
             UPDATED_TIME=now()
         where customer_id=#{customerId}
         and id=#{icPartyActId}
+        and PUBLISH_STAFF_ID=#{userId}
     </update>
 
     <select id="selectNeedRemindAutoPublishAct" parameterType="java.lang.String" resultType="com.epmet.modules.partyOrg.entity.IcPartyActEntity">
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
index a639a41a8d..2cc7ec146f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
@@ -33,5 +33,6 @@
              UPDATED_BY=#{userId},
              UPDATED_TIME=now()
         where IC_PARTY_ACT_ID=#{icPartyActId}
+        and CREATED_BY=#{userId}
     </update>
 </mapper>
\ No newline at end of file