From 9e9653c3fcc3ccd3731533535fa338d67c4dd485 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 04 六月 2024 17:42:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
index f6500ee..f4b43de 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
@@ -163,13 +163,8 @@
             bookList.stream().forEach(a -> {
                 if (Constants.equalsInteger(s.getId(), a.getRoomTimeId())) {
                     s.setIsUse(true);
-                }
-                if (roomTime.getBookingId() != null && Constants.equalsInteger(roomTime.getBookingId(), a.getId())) {
-                    if (Constants.equalsInteger(a.getRoomTimeId(), s.getId())) {
-                        s.setIsChoose(true);
-                       // s.setIsUse(false);
-                        s.setBookingTimeId(a.getBookingTimeId());
-                    }
+                    s.setIsChoose(true);
+                    s.setBookingTimeId(a.getId());
                 }
             });
 

--
Gitblit v1.9.3