From e3d738cc6945888fbb92749af67a84c01c02bae1 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期四, 18 五月 2023 17:05:32 +0800
Subject: [PATCH] 打卡信息列表调整和会议室管理调整

---
 src/main/java/com/product/administration/service/ConferenceManagerService.java |   13 ++++++++++++-
 1 files changed, 12 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 c43c8e7..06cca3b 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -111,10 +111,21 @@
     @Transactional
     @Override
     public boolean saveConferenceRoom(FieldSetEntity fse) throws BaseException {
+    	//閲嶅悕楠岃瘉瀵硅薄
+    	FieldSetEntity nameVerification = null;
         if (StringUtils.isEmpty(fse.getUUID())) {
             fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
-        }
+            nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=?", new Object[] {fse.getString("room_name")}, false);
+        }else {
+        	nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=? and uuid!=?", new Object[] {fse.getString("room_name"), fse.getUUID()}, false);
+		}
+        if (nameVerification!=null) {
+			throw new BaseException(SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getValue(), SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getText());
+		}
+        
         BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
+        //閲嶅悕楠岃瘉
+        
         return baseDao.saveFieldSetEntity(fse);
     }
 

--
Gitblit v1.9.2