From 415539df93d07359e776004fe32cd399e0b3b07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Mon, 7 Dec 2020 11:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/db/models/user_dao.go          | 13 +++++++++++++
 internal/rpc/services/service_admin.go  |  7 ++++---
 internal/rpc/services/service_server.go | 14 ++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/internal/db/models/user_dao.go b/internal/db/models/user_dao.go
index 618dfec6..8f7d90b1 100644
--- a/internal/db/models/user_dao.go
+++ b/internal/db/models/user_dao.go
@@ -63,6 +63,19 @@ func (this *UserDAO) FindEnabledUser(id int64) (*User, error) {
 	return result.(*User), err
 }
 
+// 查找用户基本信息
+func (this *UserDAO) FindEnabledBasicUser(id int64) (*User, error) {
+	result, err := this.Query().
+		Pk(id).
+		Attr("state", UserStateEnabled).
+		Result("id", "fullname", "username").
+		Find()
+	if result == nil {
+		return nil, err
+	}
+	return result.(*User), err
+}
+
 // 获取管理员名称
 func (this *UserDAO) FindUserFullname(userId int64) (string, error) {
 	return this.Query().
diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go
index c07cb31d..97ea7ee2 100644
--- a/internal/rpc/services/service_admin.go
+++ b/internal/rpc/services/service_admin.go
@@ -251,9 +251,10 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA
 		}
 
 		list := &pb.AdminModuleList{
-			AdminId: int64(admin.Id),
-			IsSuper: admin.IsSuper == 1,
-			Modules: pbModules,
+			AdminId:  int64(admin.Id),
+			IsSuper:  admin.IsSuper == 1,
+			Fullname: admin.Fullname,
+			Modules:  pbModules,
 		}
 		result = append(result, list)
 	}
diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go
index ade2a442..95dd1af0 100644
--- a/internal/rpc/services/service_server.go
+++ b/internal/rpc/services/service_server.go
@@ -430,6 +430,19 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
 			}
 		}
 
+		// 用户
+		user, err := models.SharedUserDAO.FindEnabledBasicUser(int64(server.UserId))
+		if err != nil {
+			return nil, err
+		}
+		var pbUser *pb.User = nil
+		if user != nil {
+			pbUser = &pb.User{
+				Id:       int64(user.Id),
+				Fullname: user.Fullname,
+			}
+		}
+
 		result = append(result, &pb.Server{
 			Id:              int64(server.Id),
 			IsOn:            server.IsOn == 1,
@@ -453,6 +466,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
 				Name: clusterName,
 			},
 			Groups: pbGroups,
+			User:   pbUser,
 		})
 	}