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 425cbf7..71d526a 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 @@ -6,6 +6,7 @@ import com.synebula.gaea.extension.toMd5 import com.synebula.gaea.mongo.query.MongoGenericQuery import com.synebula.gaea.mongo.whereId import com.synebula.zeus.query.contr.IUserQuery +import com.synebula.zeus.query.view.GroupView import com.synebula.zeus.query.view.RoleView import com.synebula.zeus.query.view.SignUserView import com.synebula.zeus.query.view.UserView @@ -15,19 +16,22 @@ import org.springframework.data.mongodb.core.query.Query import org.springframework.data.mongodb.core.query.isEqualTo class UserQuery(template: MongoTemplate) : - MongoGenericQuery("user", UserView::class.java, template), IUserQuery { + MongoGenericQuery("user", UserView::class.java, template), IUserQuery { override fun signIn(name: String, password: String): Message { this.check() val query = Query.query( - Criteria.where("name").isEqualTo(name) - .and("password").isEqualTo(password.toMd5()) - .and("alive").isEqualTo(true) + Criteria.where("name").isEqualTo(name) + .and("password").isEqualTo(password.toMd5()) + .and("alive").isEqualTo(true) ) val user = this.template.findOne(query, this.clazz!!, "user") 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 ?: "")) + val group = this.template.findOne(whereId(user.group), GroupView::class.java, "group") + Message(SignUserView(user.id, user.name, user.realName ?: "", + user.role ?: "", role?.name ?: "", + user.group ?: "", group?.name ?: "")) } else Message(Status.Failure, "用户名或密码错误") } 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 bac49d3..2f0269a 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 @@ -1,10 +1,11 @@ package com.synebula.zeus.query.view class SignUserView( - var id: String = "", - var name: String = "", - var realName: String = "", - var role: String = "", - var group: String = "", - var roleName: String = "" + var id: String = "", + var name: String = "", + var realName: String = "", + var role: String = "", + var roleName: String = "", + var group: String = "", + var groupName: String = "" ) \ No newline at end of file