Merge branch 'feature/v1.0.4' of https://jygit.jydev.jianyu360.cn/CRM/application into feature/v1.0.4

api/internal/service/owner.go

@@ -456,7 +456,7 @@ func Findfirstparty(buyerArr []string, returnData []map[string]interface{}) []ma
 							"a_name":       v.Aname,
 							"a_id":         v.Aid,
 							"sourceType":   "firstparty",
-							"relationship": "业主的上级机构",
+							"relationship": "业主的下级机构",
 							"personName":   gconv.String(personMap[v.Bid]),
 						})
 
@@ -482,7 +482,7 @@ func Findfirstparty(buyerArr []string, returnData []map[string]interface{}) []ma
 							"a_name":       v.Bname,
 							"a_id":         v.Bid,
 							"sourceType":   "firstparty",
-							"relationship": "业主的下级机构",
+							"relationship": "业主的上级机构",
 							"personName":   gconv.String(personMap[v.Aid]),
 						})
 					}
@@ -756,8 +756,11 @@ func ProjectHandle(buyerArr []string, entAccountId int64, entName, area, project
 			logx.Error("解析项目数据失败", object)
 			continue
 		}
+
 		err := json.Unmarshal(bs, &buyerArr)
-		logx.Info(err)
+		if err != nil {
+			logx.Error(err)
+		}
 		for _, v := range buyerArr.Buckets {
 			buyerName := v.Key
 			area := ""
@@ -837,8 +840,7 @@ func FindHandle(sqlStr string, dataMap *map[string]map[string]interface{}) {
 	}
 	for rows.Next() {
 		data := Recommend{}
-		aa := rows.ScanStruct(&data)
-		logx.Info(aa)
+		rows.ScanStruct(&data)
 		if data.BuyerId != "" {
 			(*dataMap)[data.BuyerId] = map[string]interface{}{
 				"buyerName": data.Buyer,
@@ -926,7 +928,9 @@ func SupplierFindConnectionsHandle(sqlStr string) []SupplierConnectionsEntitys {
 	for rows.Next() {
 		data := SupplierConnectionsEntity{}
 		err = rows.ScanStruct(&data)
-		logx.Info(err)
+		if err != nil {
+			logx.Error(err)
+		}
 		if len(data.Winner) == 0 {
 			returnData = append(returnData, SupplierConnectionsEntitys{
 				Zbtime:       data.Zbtime,