ledger-spring.git

			@@ -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