From 0c4930efa8b5f0f416da2b01574ceae19246b05d Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期五, 19 五月 2023 16:31:34 +0800
Subject: [PATCH] 会议纪要无法提交
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 8 ++++++--
1 files changed, 6 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 e09d980..5eaa0e0 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -141,6 +141,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);
@@ -237,9 +241,9 @@
sql.append(" b.meeting_topic, ");
sql.append(" b.start_time, ");
sql.append(" b.end_time, ");
- sql.append(" b.created_by ");
+ sql.append(" b.created_by,b.flow_flag ");
sql.append(" ORDER BY ");
- sql.append(" a.id,b.start_time ");
+ sql.append(" b.start_time ");
DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
baseDao.loadPromptData(dt);
--
Gitblit v1.9.2