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/domain/ds2/repository/UserInfoTZRep.kt |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserInfoTZRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserInfoTZRep.kt
index 955ed62..0a030f9 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserInfoTZRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserInfoTZRep.kt
@@ -1,10 +1,12 @@
 package cn.flightfeather.supervision.domain.ds2.repository
 
 import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.common.utils.UUIDGenerator
 import cn.flightfeather.supervision.domain.ds2.entity.UserinfoTZ
 import cn.flightfeather.supervision.domain.ds2.mapper.UserinfoTZMapper
 import org.springframework.stereotype.Repository
 import tk.mybatis.mapper.entity.Example
+import java.util.*
 
 @Repository
 class UserInfoTZRep(private val userinfoTZMapper: UserinfoTZMapper) {
@@ -17,12 +19,32 @@
      */
     fun findEnterpriseUser(district: String?, sceneType: Constant.SceneType): List<UserinfoTZ?> {
         val type = Constant.SceneType.typeMap(sceneType.value.toByte())
+        return findEnterpriseUser(district, type?.toInt())
+    }
+
+    /**
+     * 鏌ユ壘鍦ㄧ嚎鐨勬寮忎紒涓氱敤鎴�
+     * @param sceneTypeTZ 椋炵窘鐜绯荤粺涓殑鍦烘櫙绫诲瀷
+     */
+    fun findEnterpriseUser(district: String?, sceneTypeTZ: Int?): List<UserinfoTZ?> {
         return userinfoTZMapper.selectByExample(Example(UserinfoTZ::class.java).apply {
-            createCriteria().andEqualTo("extension2", type)
+            createCriteria().andEqualTo("extension2", sceneTypeTZ)
                 .andEqualTo("extension1", district)
                 .andEqualTo("usertypeid", Constant.UserType.ENTERPRISE.value)
                 .andEqualTo("isenable", true)
             and(createCriteria().orIsNull("workno").orNotEqualTo("workno", "test"))
         })
     }
+
+    fun findOne(userinfoTZ: UserinfoTZ): UserinfoTZ? {
+        return userinfoTZMapper.selectOne(userinfoTZ)
+    }
+
+    fun insert(userinfoTZ: UserinfoTZ): Int {
+        if (userinfoTZ.guid == null) userinfoTZ.guid = UUIDGenerator.generate16ShortUUID()
+        if (userinfoTZ.headIconUrl == null) userinfoTZ.headIconUrl = ""
+        userinfoTZ.uiCreateTime = Date()
+        return userinfoTZMapper.insert(userinfoTZ)
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3