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

api/internal/service/employService.go

@@ -566,20 +566,31 @@ func employInfoPerson(v, table, id, employKey, findKey string, source int64, in
 	} else {
 		sourceId = id
 	}
-	employData := MC.CrmMysql.FindOne(table, map[string]interface{}{
-		employKey:     sourceId,
-		"position_id": in.PositionId,
-		"source":      source,
-	}, "is_ignore,status,id", "")
+	employData := &map[string]interface{}{}
+	if in.EmployType == 1 {
+		employData = MC.CrmMysql.FindOne(table, map[string]interface{}{
+			employKey:     sourceId,
+			"position_id": in.PositionId,
+			"source":      source,
+		}, "is_ignore,status,id,type", "")
+	} else {
+		employData = MC.CrmMysql.FindOne(table, map[string]interface{}{
+			employKey:     sourceId,
+			"position_id": in.PositionId,
+			"source":      source,
+		}, "is_ignore,status,id", "")
+	}
 	employId := int64(0)
 	if employData != nil && len(*employData) > 0 {
 		valueMap["isIgnore"] = common.If(common.Int64All((*employData)["is_ignore"]) == 1, true, false)
 		valueMap["isEmploy"] = common.If(common.Int64All((*employData)["status"]) == 1, true, false)
+		valueMap["type"] = common.Int64All((*employData)["type"])
 		employId = common.Int64All((*employData)["id"])
 		valueMap["employId"] = employId
 	} else {
 		valueMap["isIgnore"] = false
 		valueMap["isEmploy"] = false
+		valueMap["type"] = 1
 	}
 	if len(strings.Split(in.IdArr, ",")) == 1 && employId > 0 {
 		//列表查询
@@ -622,6 +633,7 @@ func employInfoEnt(v, table, id, employKey, findKey, depIDArr string, source int
 		"customCount": 0,
 		"clueCount":   0,
 		"chanceCount": 0,
+		"type":        1,
 	}
 	sourceId := ""
 	if isNiJian {
@@ -629,16 +641,23 @@ func employInfoEnt(v, table, id, employKey, findKey, depIDArr string, source int
 	} else {
 		sourceId = id
 	}
-	employData := MC.CrmMysql.SelectBySql(fmt.Sprintf("select  GROUP_CONCAT(id) as  employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from  %s   where %s=? and  source=? and    ent_dept_id in  (%s) and  status=1", table, employKey, depIDArr), sourceId, source)
+	employData := &[]map[string]interface{}{}
+	if in.EmployType == 1 {
+		employData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  GROUP_CONCAT(id) as  employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status,MAX(type) as  type from  %s   where %s=? and  source=? and    ent_dept_id in  (%s) and  status=1", table, employKey, depIDArr), sourceId, source)
+	} else {
+		employData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  GROUP_CONCAT(id) as  employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from  %s   where %s=? and  source=? and    ent_dept_id in  (%s) and  status=1", table, employKey, depIDArr), sourceId, source)
+	}
 	employArrStr := ""
 	if employData != nil && len(*employData) > 0 {
 		valueMap["isIgnore"] = common.If(common.Int64All((*employData)[0]["is_ignore"]) == 1, true, false)
 		valueMap["isEmploy"] = common.If(common.Int64All((*employData)[0]["status"]) == 1, true, false)
+		valueMap["type"] = common.Int64All((*employData)[0]["type"])
 		employArrStr = common.InterfaceToStr((*employData)[0]["employIdArr"])
 		valueMap["employId"] = strings.Split(employArrStr, ",")[0]
 	} else {
 		valueMap["isIgnore"] = false
 		valueMap["isIgnore"] = false
+		valueMap["type"] = 1
 	}
 	if len(strings.Split(in.IdArr, ",")) == 1 && employArrStr != "" {
 		//列表查询