From d2727f231319a48019bc3b87439136ab49b97b9b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 08 十一月 2024 09:49:57 +0800 Subject: [PATCH] 1. 2024.11.08 修复部分bug --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt index b0fe633..77b2a75 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt @@ -39,7 +39,8 @@ val monitorobjectversionlist = monitorobjectversionMapper.select(monitorobjectversion) return monitorobjectversionlist.filter { - val usedCount = it.extension1 ?: "0";it.monitornum.toString().toInt() - usedCount.toInt() > 0 + val usedCount = it.extension1 ?: "0" + it.monitornum.toString().toInt() - usedCount.toInt() > 0 }.sortedBy { it.displayid } } @@ -75,6 +76,7 @@ if (vo.sguid == scene.guid) { vo.sceneTypeId = scene.typeid?.toInt() ?: 0 vo.sceneType = scene.type + vo.scene = scene return@f } } -- Gitblit v1.9.3