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

api/internal/service/owner.go

@@ -273,6 +273,9 @@ where
 		agencyMap := map[string]map[string]interface{}{}
 		agencyIdMap := map[string]bool{}
 		for _, m := range winnerArr {
+			if m.EntId == "" {
+				continue
+			}
 			projectId := encrypt.EncodeArticleId2ByCheck(m.Project_id)
 			projectName := m.Project_name
 			zbtime := m.Zbtime
@@ -1065,6 +1068,8 @@ func (t *OwnerService) OwnerCooperate() []map[string]interface{} {
 	}
 	return returData
 }
+
+// 候选渠道
 func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 	returnData := []*ResultData{}
 	dataMap := &map[string]map[string]interface{}{}