diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt index 37947c9..425cbf7 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt @@ -4,8 +4,9 @@ import com.synebula.gaea.data.message.Message import com.synebula.gaea.data.message.Status import com.synebula.gaea.extension.toMd5 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.view.RoleView import com.synebula.zeus.query.view.SignUserView import com.synebula.zeus.query.view.UserView import org.springframework.data.mongodb.core.MongoTemplate @@ -24,9 +25,10 @@ class UserQuery(template: MongoTemplate) : .and("alive").isEqualTo(true) ) val user = this.template.findOne(query, this.clazz!!, "user") - return if (user != null) - Message(SignUserView(user.id, user.name, user.role ?: "")) - else + return if (user != null) { + val role = this.template.findOne(whereId(user.role), RoleView::class.java, "role") + Message(SignUserView(user.id, user.name, user.realName ?: "", user.role ?: "", role?.name ?: "")) + } else Message(Status.Failure, "用户名或密码错误") } } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt index d583f4b..3351191 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt @@ -3,5 +3,7 @@ package com.synebula.zeus.query.view class SignUserView( var id: String = "", var name: String = "", - var role: String = "" + var realName: String = "", + var role: String = "", + var roleName: String = "" ) \ No newline at end of file