From 2ae8bf126599f68ba1ca721ff2acc1dd4461e9a5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 12 九月 2023 11:05:47 +0800
Subject: [PATCH] 1. 整合了飞羽环境、徐汇油烟及金山扬尘两个数据库； 2. 优化重构自动评估模块逻辑； 3. 新增监测数据自动化统； 4. 将自动统计应用于自动评估中；
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/TaskServiceImpl.kt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/TaskServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/TaskServiceImpl.kt
index 022941c..e80a61c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/TaskServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/TaskServiceImpl.kt
@@ -222,7 +222,7 @@
// example.or(
example.createCriteria().andIsNull("tsguid")
.andEqualTo("districtcode", districtCode)
- .andLessThan("starttime", date)
+ .andLessThanOrEqualTo("starttime", date)
.andGreaterThanOrEqualTo("endtime", date)
// )
example.orderBy("starttime").desc()
@@ -506,7 +506,7 @@
val criteria = example.createCriteria()
//鑾峰彇鐢ㄦ埛淇℃伅
val userInfo = userinfoMapper.findOne(guid)
- val districtCode = userInfo.dGuid
+ val districtCode = userInfo?.dGuid
//娣诲姞鏃ユ湡杩囨护
--
Gitblit v1.9.3