Merge branch 'master' of https://jygit.jydev.jianyu360.cn/CRM/application into master

api/internal/service/employService.go

@@ -61,7 +61,7 @@ func (e *EmPloyService) InfoEmployinfo(in *types.InfoEmployinfoReq) []map[string
 			valueMap["isIgnore"] = false
 			valueMap["isEmploy"] = false
 		}
-		if len(strings.Split(in.IdArr, ",")) == 1 {
+		if len(strings.Split(in.IdArr, ",")) == 1 && employId > 0 {
 			//列表查询
 			//是否忽略处理
 			//客户数量
@@ -216,6 +216,8 @@ func InfoFind(id string, employType int64) map[string]interface{} {
 			obj = *aobj
 		}
 		if ok && obj != nil && len(obj) > 0 {
+			toptype := common.InterfaceToStr(obj["toptype"])
+			subtype := common.InterfaceToStr(obj["subtype"])
 			data["title"] = common.ObjToString(obj["title"])
 			data["city"] = obj["city"]
 			data["area"] = obj["area"]
@@ -227,8 +229,10 @@ func InfoFind(id string, employType int64) map[string]interface{} {
 			data["buyer"] = obj["buyer"]
 			data["winner"] = obj["s_winner"]
 			//类型处理
-			toptype := common.InterfaceToStr(obj["toptype"])
-			subtype := common.InterfaceToStr(obj["subtype"])
+			/*if subtype == "拟建" {
+				data["type"] = 1
+				data["type"] = 2
+			} else */
 			if toptype == "采购意向" || toptype == "预告" || toptype == "招标" {
 				data["type"] = 2
 			} else {
@@ -239,6 +243,11 @@ func InfoFind(id string, employType int64) map[string]interface{} {
 				} else {
 					data["type"] = 1
 				}
+			}
+			if common.InterfaceToStr(obj["subtype"]) == "拟建" {
+
+			} else {
+
 			}
 			//data["type"] = in.SourceType
 			if obj["projectinfo"] != nil {
@@ -418,10 +427,12 @@ func (e *EmPloyService) IgnoreOperate(in *types.IgnoreOperateReq) {
 		if in.IsIgnore {
 			MC.CrmMysql.Update(table, findMap, map[string]interface{}{
 				"is_ignore": 1,
+				"is_handle": 1,
 			})
 		} else {
 			MC.CrmMysql.Update(table, findMap, map[string]interface{}{
 				"is_ignore": 0,
+				"is_handle": 1,
 			})
 		}
 	}