From 56225e892a0620177fbeac810956578def5e8be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B3=BD=E4=B8=B0?= <616973936@qq.com>
Date: Wed, 16 Jan 2019 01:09:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=A0=B9=E6=8D=AE=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7=E5=90=8D=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A=E6=96=87=E6=A1=A3=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/MemberResult.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/models/MemberResult.go b/models/MemberResult.go
index 47a9ca04..8ae5372c 100644
--- a/models/MemberResult.go
+++ b/models/MemberResult.go
@@ -108,3 +108,17 @@ func (m *MemberRelationshipResult) FindNotJoinUsersByAccount(bookId, limit int,
 
 	return members, err
 }
+
+// 根据姓名以及用户名模糊查询指定文档中不存在的用户列表
+func (m *MemberRelationshipResult) FindNotJoinUsersByAccountOrRealName(bookId, limit int, keyWord string) ([]*Member, error) {
+	o := orm.NewOrm()
+
+	sql := "SELECT m.* FROM md_members as m LEFT JOIN md_relationship as rel ON rel.member_id = m.member_id AND rel.book_id = ? WHERE rel.relationship_id IS NULL AND (m.real_name LIKE ?) OR (m.account LIKE ?) LIMIT 0,?;"
+
+	var members []*Member
+
+	_, err := o.Raw(sql, bookId, keyWord,keyWord, limit).QueryRows(&members)
+
+	return members, err
+}
+

From 55f15c438ba7b91744ec25395794a2c086b36074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B3=BD=E4=B8=B0?= <616973936@qq.com>
Date: Wed, 16 Jan 2019 01:10:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=88=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=94=AF=E6=8C=81=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E7=9A=84=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=89=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=94=B9=E6=88=90=E5=B1=95=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?[=E5=A7=93=E5=90=8D]=E7=9A=84=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/SearchController.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/SearchController.go b/controllers/SearchController.go
index 12fe0819..f8a73294 100644
--- a/controllers/SearchController.go
+++ b/controllers/SearchController.go
@@ -98,7 +98,8 @@ func (c *SearchController) User() {
 		c.JsonResult(500, "项目不存在")
 	}
 
-	members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccount(book.BookId, 10, "%"+keyword+"%")
+	//members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccount(book.BookId, 10, "%"+keyword+"%")
+	members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccountOrRealName(book.BookId, 10, "%"+keyword+"%")
 	if err != nil {
 		beego.Error("查询用户列表出错：" + err.Error())
 		c.JsonResult(500, err.Error())
@@ -109,7 +110,7 @@ func (c *SearchController) User() {
 	for _, member := range members {
 		item := models.KeyValueItem{}
 		item.Id = member.MemberId
-		item.Text = member.Account
+		item.Text = member.Account + "[" + member.RealName + "]"
 		items = append(items, item)
 	}