abiao преди 4 години
родител
ревизия
ac66184ef2

+ 13 - 4
go/gopath/src/fohow.com/apps/controllers/user_controller/agent_apply_controller.go

@@ -139,13 +139,22 @@ func (self *UserController) GetAgentDetail() {
 		self.ReturnError(403, apps.NoExist, "", nil)
 	}
 	introUser := user_model.GetWxUserById(item.IntroUserId, true)
-
+	itemUser := user_model.GetWxUserById(item.WxUId, true)
 	if item.Depart != curWxUser.Depart {
 		self.ReturnError(403, apps.ComNotAllow, "", nil)
 	}
-	item.Head = curWxUser.Head
-	item.IntroNickName = introUser.Nickname
-	item.SaleGroupSum = curWxUser.SaleGroupSum
+
+	if introUser != nil {
+		item.IntroHead = introUser.Head
+		item.IntroNickName = introUser.Nickname
+	}
+
+	if itemUser != nil {
+		item.Head = itemUser.Head
+		item.SaleGroupSum = itemUser.SaleGroupSum
+		item.SaleGroup = itemUser.SaleGroup
+	}
+
 	self.Data["json"] = item
 	self.ServeJSON()
 }

+ 1 - 0
go/gopath/src/fohow.com/apps/models/user_model/agent_application.go

@@ -26,6 +26,7 @@ type AgentApply struct {
 	ComUser       int64     `orm:"column(com_user_id)"                                 json:"com_user_id"`    // int(11)
 	ComTime       int64     `orm:"column(com_time)"                                    json:"com_time"`       // int(11)
 	Head          string    `orm:"-"                                                   json:"head"`           // varchar(255)
+	IntroHead     string    `orm:"-"                                                   json:"intro_head"`     // varchar(255)
 	IntroNickName string    `orm:"-"                                          json:"intro_nick_name"`         // varchar(255)
 	SaleGroupSum  float64   `orm:"-"                                                   json:"sale_group_sum"` // varchar(255)
 	SaleGroup     float64   `orm:"-"                                                   json:"sale_group"`     // varchar(255)