From dc38d2b63bd35f8e0f67b0f300b587b0575e9bb1 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 11 十月 2021 17:44:53 +0800
Subject: [PATCH] 整合飞羽监管企业用户问题整改功能模块对应的接口功能 1. 修改用户信息获取接口，新增飞羽环境用户在飞羽监管中对应的用户id 用户评分表修改 1. 修复用户评分表获取错乱问题
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt | 21 +++++++++++++++------
1 files changed, 15 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..e27c237 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
--
Gitblit v1.9.3