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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 758e224..93d99d9 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -122,10 +122,10 @@
         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);
     }
 
@@ -233,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