From 329a030dc9132342cec378d2fd471df7cc622c71 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Sun, 31 May 2020 23:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/com/synebula/zeus/query/impl/UserQuery.kt   | 10 ++++++----
 .../com/synebula/zeus/query/view/SignUserView.kt       |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

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