From 9867f6d5c5bccfe52b878c344c536905dd6b309e Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 09 六月 2022 08:48:06 +0800
Subject: [PATCH] 1. 接口文档自动输出

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 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 21c3102..b0105f7 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
@@ -16,11 +16,12 @@
 
 @Service
 class UserinfoServiceImpl(
-        val userinfoMapper: UserinfoMapper,
-        val baseInfoMapper: BaseInfoMapper,
-        val companyMapper: CompanyMapper,
-        val restaurantBaseInfoMapper: RestaurantBaseInfoMapper,
-        val vehicleBaseInfoMapper: VehicleBaseInfoMapper
+    val userinfoMapper: UserinfoMapper,
+    val baseInfoMapper: BaseInfoMapper,
+    val companyMapper: CompanyMapper,
+    val restaurantBaseInfoMapper: RestaurantBaseInfoMapper,
+    val vehicleBaseInfoMapper: VehicleBaseInfoMapper,
+    val userMapMapper: UserMapMapper
 ) : UserinfoService {
 
     //鏍规嵁userinfo鏉′欢鏌ヨ
@@ -36,7 +37,13 @@
         }
     }
 
-    override fun findOne(id: String): Userinfo = userinfoMapper.selectByPrimaryKey(id)
+    override fun findOne(id: String): Userinfo{
+        val userInfo = userinfoMapper.selectByPrimaryKey(id)
+        userMapMapper.selectByPrimaryKey(id)?.let {
+            userInfo?.extension3 = it.svUserId
+        }
+        return userInfo ?: Userinfo()
+    }
 
     override fun findAll(): MutableList<Userinfo> = userinfoMapper.selectAll()
 
@@ -55,6 +62,8 @@
         return AccessToken().apply {
             if (result.isNotEmpty()) {
                 userId = result[0].guid
+                val sUser = userMapMapper.selectByPrimaryKey(userId)
+                sUserId = sUser?.svUserId
                 success = true
             } else {
                 success = false
@@ -197,4 +206,16 @@
 
         return UserBaseInfo(userId, userInfo.realname, baseInfo, companyInfo, specialInfo)
     }
+
+    override fun search(district: String?, sceneType: Int?, userType: Int?, page: Int, perPage: Int): BaseResponse<List<Userinfo>> {
+        val result = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
+            createCriteria().apply {
+                district?.let { andEqualTo("extension1", it) }
+                sceneType?.let { andEqualTo("extension2", it) }
+                userType?.let { andEqualTo("usertypeid", it) }
+            }
+        })
+
+        return BaseResponse(true, data = result)
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3