From 53fb82ae6c4fb6a3e3ccfda4e21c4ce875570bac Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 21 Jul 2023 15:51:57 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=8F=82=E4=BC=9A=E4=BA=BA=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E5=8F=82=E4=BC=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayMeetingSituationController.java        | 22 +++++++++++++++++++
 .../impl/PayMeetingSituationServiceImpl.java  |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index fe6958a8..0b745288 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -151,6 +151,17 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK("删除成功!");
     }
 
+    /**
+     * 通过id删除
+     */
+    @AutoLog(value = "企业人员-通过id删除参会信息")
+    @ApiOperation(value = "企业人员-通过id删除参会信息")
+    @GetMapping(value = "/contactsDelete")
+    public Result<?> contactsDelete(@RequestParam(name = "id") String id) {
+        payMeetingSituationService.deleteById(id);
+        return Result.OK("删除成功!");
+    }
+
     /**
      * 批量删除
      */
@@ -163,6 +174,17 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK("批量删除成功!");
     }
 
+    /**
+     * 编辑
+     */
+    @AutoLog(value = "企业人员-编辑参会信息")
+    @ApiOperation(value = "企业人员-编辑参会信息", notes = "企业人员-编辑参会信息")
+    @PostMapping(value = "/contactsEdit")
+    public Result<?> contactsEdit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
+        payMeetingSituationService.editById(payMeetingSituationVO,MEETING_TYPE);
+        return Result.OK("编辑成功!");
+    }
+
     /**
      * 通过id查询
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 71f8d43a..916fbf03 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1428,8 +1428,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         queryWrapper1.eq(PayMeetingContacts::getMeetingId, meetingId);
         queryWrapper1.eq(PayMeetingContacts::getMeetingContactsId,sysUserId);
         boolean b = meetingContactsService.count(queryWrapper1) > 0;
-        if (!b && !payMeeting.getDirectorId().equals(sysUserId)) {
-            throw new JeroBootException("只有会议负责人，会议联系人可以删除");
+        if (!b && !payMeeting.getDirectorId().equals(sysUserId)&& !payMeetingSituation.getCompanyContactId().equals(sysUserId)) {
+            throw new JeroBootException("只有会议负责人，会议联系人，参会人可以删除");
         }
         Integer inAccount = payMeetingSituation.getInAccount();
         if (!inAccount.equals(PayProjectCommon.IN_ACCOUNT0)) {