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 contactsDelete(@RequestParam(name = "id") String id) { + payMeetingSituationService.deleteById(id); + return Result.OK("删除成功!"); + } + /** * 批量删除 */ @@ -163,6 +174,17 @@ public class PayMeetingSituationController extends JeroController 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 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)) {