diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java
index 62c517c..4455c08 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java
@@ -268,18 +268,13 @@ public class MeetingReservationController extends BaseController {
     @PostMapping("beforehand")
     public R beforehand(@RequestBody MeetingReservationDTO meetingReservationDTO) {
         Long userId = getLoginStaffId();
+        IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(userId);
+        if (staff.getRoomRole() != 5L) return R.error("权限不足！");
         MeetingReservation meetingReservation = new MeetingReservation();
-        if (meetingReservationDTO.getMr().getTimeFormat() > 0) {//非任意时间
-            Date start = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), true);
-            Date end = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), false);
-            meetingReservation.setStart(start);
-            meetingReservation.setEnd(end);
-        } else {
-            meetingReservation.setStart(meetingReservationDTO.getMr().getStart());
-            meetingReservation.setEnd(meetingReservationDTO.getMr().getEnd());
-        }
-        meetingReservation.setTimeFormat(meetingReservationDTO.getMr().getTimeFormat());
         meetingReservation.setRoomId(meetingReservationDTO.getMr().getRoomId());
+        meetingReservation.setStart(meetingReservationDTO.getMr().getStart());
+        meetingReservation.setEnd(meetingReservationDTO.getMr().getEnd());
+        meetingReservation.setTimeFormat(0);
         meetingReservation.setTitle("占用");
         String result = meetingReservationService.beforehand(userId, meetingReservation);
         if (IMeetingReservationService.OK.equals(result)) {
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
index 3198caf..847ebf2 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
@@ -170,7 +170,12 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
     public String operateMeetingReservation(Long currentUserId, Long id, MrOperate operate, String content) {
         MeetingReservation meetingReservation = meetingReservationMapper.selectMeetingReservationById(id);
         if (meetingReservation == null) return "未找到预约记录";
-        if (meetingReservation.getStatus() != 5) return "预约记录不能" + operate.getValue();
+        if (MrOperate.CANCEL.equals(operate) && (meetingReservation.getStatus() < 5 || meetingReservation.getStatus() > 7)) {
+            return "预约记录不能" + operate.getValue();
+        }
+        if (!MrOperate.CANCEL.equals(operate) && meetingReservation.getStatus() != 5) {
+            return "预约记录不能" + operate.getValue();
+        }
         if (MrOperate.CANCEL.equals(operate) && !meetingReservation.getCreateBy().equals(currentUserId.toString()))
             return "不能取消非本人的预约记录";
         Date now = new Date();