From fce33dfd8f4e4ceb2a48f8c6509601468150e5f8 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Mon, 1 Jun 2020 17:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/service/sys_user.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/service/sys_user.go b/server/service/sys_user.go
index b72791b0..56e34116 100644
--- a/server/service/sys_user.go
+++ b/server/service/sys_user.go
@@ -42,11 +42,7 @@ func Register(u model.SysUser) (err error, userInter model.SysUser) {
 func Login(u *model.SysUser) (err error, userInter *model.SysUser) {
 	var user model.SysUser
 	u.Password = utils.MD5V([]byte(u.Password))
-	err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error
-	if err != nil {
-		return err, &user
-	}
-	err = global.GVA_DB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error
+	err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).Preload("Authority").First(&user).Error
 	return err, &user
 }
 
-- 
GitLab