From f62503abbe059d7b07bd7b8031e9689d0958c0d3 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 14:57:24 +0800
Subject: [PATCH] 会议室功能优化8.22
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index dbcc4c3..f539163 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -569,7 +569,7 @@
List<String> list1=new ArrayList();
List<String> list2=new ArrayList();
for (int j = 0; j < listDate.size(); j++) {
- if(ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("宸茬鍒�")){
+ if((ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("宸茬鍒�")) || (ObjectUtil.isNotEmpty(listDate.get(j).get("visit_status"))&&listDate.get(j).get("visit_status").equals("宸茶闂�")) ){
if(!list1.contains(listDate.get(j).get("org_level_name"))){
list1.add(listDate.get(j).get("org_level_name").toString());
HashMap<String,Object> hashMap=new HashMap<>();
--
Gitblit v1.9.2