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

api/internal/logic/networklistlogic.go

@@ -1,12 +1,11 @@
 package logic
 
 import (
-	"context"
-	"fmt"
-
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"context"
+	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

api/internal/service/owner.go

@@ -601,8 +601,8 @@ func FindStatus(positionId int64) (map[string]bool, map[string]bool, map[string]
 	//已创建
 	createdMap := map[string]bool{}
 	processingArr := CrmMysql.Find(entity.CONNECTION_STATUS, map[string]interface{}{
-		"type":        1,
-		"position id": positionId,
+		"itype":       1,
+		"position_id": positionId,
 	}, "relate_id,is_handle,is_ignore,is_create", "", -1, -1)
 	if processingArr != nil && len(*processingArr) > 0 {
 		for _, v := range *processingArr {
@@ -783,7 +783,7 @@ func ProjectHandle(buyerArr []string, entAccountId int64, entName, area, project
 
 		}
 	}
-	if projectType == "1" {
+	if projectType == "1" || area != "" {
 		if entName == "" {
 			for buyerId, v := range *dataMap {
 				buyerName := gconv.String(v["buyerName"])