Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-01 e6b95596eefeadf0fac3a8029af17e95e4f14c58

 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 ");