From da4f7077a96cab425d7710d60624174b10c0c9e2 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 八月 2024 17:07:48 +0800
Subject: [PATCH] commit
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 19 +++++++++++++++++--
1 files changed, 17 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 c43c8e7..93d99d9 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);
}
@@ -141,6 +152,10 @@
@Override
@Transactional
public String saveConferenceApply(FieldSetEntity fse) throws BaseException {
+ if ("0".equals(fse.getString("type"))){
+ baseDao.saveFieldSetEntity(fse);
+ return fse.getUUID();
+ }
if (StringUtils.isEmpty(fse.getUUID())) {
fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
fse.setValue("flow_flag", 0);
@@ -218,8 +233,8 @@
sql.append(" b.end_time, ");
}
sql.append(" b.flow_flag, ");
- sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" FROM ");
+ sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" product_oa_CONFERENCE_room_config a ");
sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM ");
sql.append(" product_oa_conference_apply b WHERE ");
--
Gitblit v1.9.2