From 554e6179b4acaeff975b83dcfa0d5c0c563d5d94 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 16 八月 2024 15:09:57 +0800
Subject: [PATCH] 会议室看板8.16-1

---
 src/main/java/com/product/administration/service/ConferenceManagerService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index fc520c9..7221351 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -213,8 +213,8 @@
         bs.append(" FROM product_oa_conference_apply y");
         bs.append(" left JOIN product_oa_conference_room_config g ");
         bs.append(" on y.meeting_room=g.uuid ");
-        bs.append(" where DATE_FORMAT(start_time,\"%Y-%m-%d\")=?");
-        bs.append(" and meeting_resource in ( ? )");
+        bs.append(" where DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=?");
+        bs.append(" and LOCATE(?, g.enable_seal)");
         DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());
         List<String> list=new ArrayList();
         List<HashMap> listDate=new ArrayList<>();

--
Gitblit v1.9.2