Merge branch 'dev_v1.0.4_wh' of CRM/application into hotfix/v1.0.4.2

api/internal/service/owner.go

@@ -452,7 +452,7 @@ func Findfirstparty(buyerArr []string, returnData []map[string]interface{}) []ma
 		}
 		personMap := map[string]string{}
 		if len(entIdArr) > 0 {
-			personSql := fmt.Sprintf(`select  id,name from   ent_contact    where   id in (%s)  ORDER by  name`, strings.Join(entIdArr, ","))
+			personSql := fmt.Sprintf(`select  id,name as  personName from   ent_contact    where   id in (%s)  ORDER by  name`, strings.Join(entIdArr, ","))
 			personArr := PersonFindConnectionsHandle(personSql)
 			//联系人处理
 			for _, v := range personArr {
@@ -499,7 +499,7 @@ func Findfirstparty(buyerArr []string, returnData []map[string]interface{}) []ma
 						"a_id":         v.Aid,
 						"sourceType":   "firstparty",
 						"relationship": "业主的上级机构",
-						"personName":   gconv.String(personMap[v.Aid]),
+						"personName":   gconv.String(personMap[v.Bid]),
 					})
 				}
 				if code == "0201" {
@@ -510,7 +510,7 @@ func Findfirstparty(buyerArr []string, returnData []map[string]interface{}) []ma
 						"a_id":         v.Aid,
 						"sourceType":   "firstparty",
 						"relationship": "业主的股东",
-						"personName":   gconv.String(personMap[v.Aid]),
+						"personName":   gconv.String(personMap[v.Bid]),
 					})
 				}