增加登录人员的角色信息

This commit is contained in:
2020-05-31 23:40:37 +08:00
parent a81d6447c5
commit 329a030dc9
2 changed files with 9 additions and 5 deletions

View File

@@ -4,8 +4,9 @@ import com.synebula.gaea.data.message.Message
import com.synebula.gaea.data.message.Status import com.synebula.gaea.data.message.Status
import com.synebula.gaea.extension.toMd5 import com.synebula.gaea.extension.toMd5
import com.synebula.gaea.mongo.query.MongoGenericQuery import com.synebula.gaea.mongo.query.MongoGenericQuery
import com.synebula.gaea.mongo.query.MongoQuery import com.synebula.gaea.mongo.whereId
import com.synebula.zeus.query.contr.IUserQuery import com.synebula.zeus.query.contr.IUserQuery
import com.synebula.zeus.query.view.RoleView
import com.synebula.zeus.query.view.SignUserView import com.synebula.zeus.query.view.SignUserView
import com.synebula.zeus.query.view.UserView import com.synebula.zeus.query.view.UserView
import org.springframework.data.mongodb.core.MongoTemplate import org.springframework.data.mongodb.core.MongoTemplate
@@ -24,9 +25,10 @@ class UserQuery(template: MongoTemplate) :
.and("alive").isEqualTo(true) .and("alive").isEqualTo(true)
) )
val user = this.template.findOne(query, this.clazz!!, "user") val user = this.template.findOne(query, this.clazz!!, "user")
return if (user != null) return if (user != null) {
Message(SignUserView(user.id, user.name, user.role ?: "")) val role = this.template.findOne(whereId(user.role), RoleView::class.java, "role")
else Message(SignUserView(user.id, user.name, user.realName ?: "", user.role ?: "", role?.name ?: ""))
} else
Message(Status.Failure, "用户名或密码错误") Message(Status.Failure, "用户名或密码错误")
} }
} }

View File

@@ -3,5 +3,7 @@ package com.synebula.zeus.query.view
class SignUserView( class SignUserView(
var id: String = "", var id: String = "",
var name: String = "", var name: String = "",
var role: String = "" var realName: String = "",
var role: String = "",
var roleName: String = ""
) )