Merge branch 'cygx/mfyx_web_1.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -581,18 +581,18 @@ func (this *CompanyController) List() {
 		citySql = strings.TrimRight(citySql, ",")
 		condition += ` AND a.city IN (` + citySql + `) `
 	}
-	
+
 	if regionType != "" {
 		condition += ` AND a.region_type =? `
 		pars = append(pars, regionType)
 	}
-	
-	//是否签约过
 
+	//是否签约过
 	if isSigning == 0 || isSigning == 1 {
 		condition += ` AND b.is_signing = ?  `
 		pars = append(pars, isSigning)
 	}
+
 	if keyWord != "" {
 		companyIdStr, err := company.GetCompanyIdByKeyWord(keyWord)
 		if err != nil {
@@ -1770,8 +1770,8 @@ func (this *CompanyController) List() {
 				CloseReason:         v.CloseReason,
 				IsSigning:           v.IsSigning,
 				CompanyStatusButton: v.CompanyStatusButton,
-				ShareSeller:     v.ShareSeller,
-				ShareSellerId:   v.ShareSellerId,
+				ShareSeller:         v.ShareSeller,
+				ShareSellerId:       v.ShareSellerId,
 			}
 			if v.ShareSellerId != 0 {
 				shareSeller := adminMap[v.ShareSellerId]
@@ -3113,7 +3113,7 @@ func (this *CompanyController) Detail() {
 	shareSellerId := 0
 	var productItem *company.CompanyProduct
 	if productId > 0 {
-		var  e  error
+		var e error
 		productItem, e = company.GetCompanyProductByCompanyIdAndProductId(companyId, productId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			br.Msg = "客户信息有误"

controllers/cygx/apply_record.go

@@ -184,6 +184,8 @@ func (this *ApplyRecordController) ListSysRole() {
 			list[i].ApplicationSource = "网页版"
 		case 5:
 			list[i].ApplicationSource = "研选小程序"
+		case 6:
+			list[i].ApplicationSource = "买方研选网页版"
 		}
 
 		switch v.InviteCompanySource {