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

api/internal/service/owner.go

@@ -1109,6 +1109,9 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 						RecentTime:  zbtime,
 						NearlyYears: near,
 					}
+					if tmp.BuyerId == "" {
+						continue
+					}
 					a1++
 					returnData = append(returnData, &tmp)
 				}
@@ -1125,6 +1128,9 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 						NearlyYears: near,
 						BuyerId:     common.ObjToString(m["nameId"]),
 					}
+					if tmp.BuyerId == "" {
+						continue
+					}
 					a2++
 					returnData = append(returnData, &tmp)
 				}
@@ -1142,6 +1148,9 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 						Relationship: "业主的关系人",
 						BuyerId:      common.ObjToString(m["b_id"]),
 					}
+					if tmp.BuyerId == "" {
+						continue
+					}
 					a3++
 					returnData = append(returnData, &tmp)
 				}
@@ -1158,6 +1167,9 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 						Relationship: common.ObjToString(m["relationship"]),
 						BuyerId:      common.ObjToString(m["b_id"]),
 					}
+					if tmp.BuyerId == "" {
+						continue
+					}
 					a4++
 					returnData = append(returnData, &tmp)
 				}
@@ -1183,8 +1195,6 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 			returnData[k] = value
 			if t.Type != "" && t.Type != value.SourceType {
 				continue
-			} else if value.BuyerId == "" {
-				continue
 			}
 			result = append(result, value)
 		}