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/UserinfoServiceImpl.kt |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserinfoServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserinfoServiceImpl.kt
index bf8a593..a15ee33 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserinfoServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserinfoServiceImpl.kt
@@ -38,13 +38,19 @@
         return result
     }
 
-    override fun findOne(id: String): Userinfo = userinfoMapper.selectByPrimaryKey(id)
+    override fun findOne(id: String): Userinfo? = userinfoMapper.selectByPrimaryKey(id)
 
     override fun findAll(): MutableList<Userinfo> = userinfoMapper.selectAll()
 
     override fun save(userinfo: Userinfo): Int = userinfoMapper.insert(userinfo)
 
-    override fun update(userinfo: Userinfo): Int = userinfoMapper.updateByPrimaryKey(userinfo)
+    override fun update(userinfo: Userinfo): Int {
+        return if (userinfo.guid.isNullOrBlank() || userinfo.acountname.isNullOrBlank() || userinfo.password.isNullOrBlank()) {
+            0
+        } else {
+            userinfoMapper.updateByPrimaryKeySelective(userinfo)
+        }
+    }
 
     override fun delete(id: String): Int = userinfoMapper.deleteByPrimaryKey(id)
 
@@ -98,6 +104,7 @@
             }
             i++
         } while (repeated && i < 20)
+        if (repeated) uName = UUIDGenerator.generateShortUUID()
         return uName
     }
 

--
Gitblit v1.9.3