fix bug

controllers/user.go

@@ -355,7 +355,7 @@ func (this *UserController) Detail() {
 	}
 	var hasPermission int
 	if user.CompanyId > 1 {
-		companyItem, err := models.GetCompanyDetailById(user.CompanyId)
+		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
@@ -392,6 +392,7 @@ func (this *UserController) Detail() {
 		} else {
 			hasPermission = 2
 		}
+		item.CompanyName = item.Note
 	}
 	item.HasPermission = hasPermission
 	br.Ret = 200
@@ -784,7 +785,7 @@ func (this *UserController) ApplyTryOut() {
 	if req.CompanyName == "" {
 		req.CompanyName = user.CompanyName
 	}
-	uid:=user.UserId
+	uid := user.UserId
 	//判断是否已经申请过
 	applyCount, err := models.GetApplyRecordCount(uid)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -793,9 +794,9 @@ func (this *UserController) ApplyTryOut() {
 		return
 	}
 
-	if applyCount>0 {
+	if applyCount > 0 {
 		br.Msg = "您已提交申请，请耐心等待。"
-		br.IsSendEmail=false
+		br.IsSendEmail = false
 		return
 	}
 

models/company.go

@@ -35,3 +35,14 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
+
+func GetCompanyDetailAllById(companyId int) (item  *CompanyDetail, err error) {
+	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile 
+            FROM company AS a
+			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
+			WHERE a.company_id=? `
+	o := orm.NewOrm()
+	err = o.Raw(sql, companyId).QueryRow(&item)
+	return
+}

models/user.go

@@ -18,6 +18,7 @@ type UserDetail struct {
 	HasPermission  int    `description:"1:无该行业权限，不存在权益客户下,2：潜在客户，未提交过申请，3：潜在客户,已提交过申请"`
 	SellerMobile   string `description:"销售手机号"`
 	SellerName     string `description:"销售名称"`
+	Note           string `json:"-" description:"申请提交时，公司名称"`
 }
 
 func GetUserDetailByUserId(userId int) (item *UserDetail, err error) {