From 5670e4a15fba292ef5f8fb90e96072de976bb621 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 28 六月 2022 14:00:22 +0800
Subject: [PATCH] 1. 中小企业守法自助相关接口更新
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 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..b54c7fe 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()
@@ -47,6 +54,7 @@
override fun delete(id: String): Int = userinfoMapper.deleteByPrimaryKey(id)
override fun login(loginRequestVo: LoginRequestVo): AccessToken {
+ if (loginRequestVo.userName.isNullOrEmpty() || loginRequestVo.password.isNullOrEmpty()) return AccessToken()
val example = Example(Userinfo::class.java)
val criteria = example.createCriteria()
criteria.andEqualTo("acountname", loginRequestVo.userName)
@@ -55,6 +63,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 +207,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