From 752e00503f672ddfe2066afb6c235721a3a912b5 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 19 十一月 2024 10:25:55 +0800 Subject: [PATCH] 2024.11.19 各项修正 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt index 96ca914..d761887 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/LedgerServiceImpl.kt @@ -231,13 +231,14 @@ .andEqualTo("mfFiletype", it.lrEasubmitkind) orderBy("mfSavetime").desc() } - ) + )?.takeIf { it.isNotEmpty() }?.get(0) val type = ledgerSubTypeMapper.selectByExample( Example(LedgerSubType::class.java).apply { createCriteria().andEqualTo("lsSubtypeid", it.lsSubtypeid) } ) result.add(LedgerVo().apply { + id = it.lrGuid this.ledgerSubTypeId = it.lsSubtypeid ledgerName = it.lsSubtypename @@ -248,10 +249,10 @@ updateDate = it.lrSubmitdate updateType = it.lrUpdatetype fileType = it.lrEasubmitkind.toInt() - path1 = media?.get(0)?.mfPath1 - remark1 = media?.get(0)?.mfDescription1 - path2 = media?.get(0)?.mfPath2 - remark2 = media?.get(0)?.mfDescription2 + path1 = media?.mfPath1 + remark1 = media?.mfDescription1 + path2 = media?.mfPath2 + remark2 = media?.mfDescription2 this.sceneType = if (it.lrExtension1 == null) SceneType.Restaurant.value else it.lrExtension1.toInt() }) } -- Gitblit v1.9.3