From f97eea31e0e3abe67790a16d7a352d30b81ecec5 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 26 Sep 2021 10:52:12 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go |  2 +-
 business/model/dao/store.go   | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 6439c0283..b6a8b387c 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -5141,7 +5141,7 @@ func GetStoreMapAudit(ctx *jxcontext.Context, storeIDs, vendorIDs, auditStatuss
 	return dao.GetStoreMapAudit(dao.GetDB(), storeIDs, vendorIDs, auditStatuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), offset, pageSize)
 }
 
-func GetBrandUser(ctx *jxcontext.Context, brandID int) (brandUsers []*model.BrandUser, err error) {
+func GetBrandUser(ctx *jxcontext.Context, brandID int) (brandUsers []*dao.GetBrandUserResult, err error) {
 	return dao.GetBrandUser(dao.GetDB(), brandID, "")
 }
 
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 472189361..27119cd39 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -1336,17 +1336,25 @@ func GetStoreMapAudit(db *DaoDB, storeIDs, vendorIDs, auditStatuss []int, fromTi
 	return page, err
 }
 
-func GetBrandUser(db *DaoDB, brandID int, userID string) (brandUsers []*model.BrandUser, err error) {
+type GetBrandUserResult struct {
+	model.BrandUser
+	Name string `json:"name"`
+}
+
+func GetBrandUser(db *DaoDB, brandID int, userID string) (brandUsers []*GetBrandUserResult, err error) {
 	sql := `
-		SELECT * FROM brand_user WHERE deleted_at = ?
+		SELECT a.*, b.name 
+		  FROM brand_user a
+		LEFT JOIN user b ON a.user_id = b.user_id
+		 WHERE a.deleted_at = ?
 	`
 	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if brandID != 0 {
-		sql += " AND brand_id = ?"
+		sql += " AND a.brand_id = ?"
 		sqlParams = append(sqlParams, brandID)
 	}
 	if userID != "" {
-		sql += " AND user_id = ?"
+		sql += " AND a.user_id = ?"
 		sqlParams = append(sqlParams, userID)
 	}
 	err = GetRows(db, &brandUsers, sql, sqlParams)