Browse Source

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

zhangxinlei1996 1 year ago
parent
commit
28c2064ec4
1 changed files with 7 additions and 4 deletions
  1. 7 4
      api/internal/service/employService.go

+ 7 - 4
api/internal/service/employService.go

@@ -50,10 +50,13 @@ func (e *EmPloyService) InfoEmployinfo(in *types.InfoEmployinfoReq) []map[string
 			employKey:     id,
 			"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)
+			employId = common.Int64All((*employData)["id"])
+			valueMap["employId"] = employId
 		} else {
 			valueMap["isIgnore"] = false
 			valueMap["isEmploy"] = false
@@ -63,14 +66,14 @@ func (e *EmPloyService) InfoEmployinfo(in *types.InfoEmployinfoReq) []map[string
 			//是否忽略处理
 			//客户数量
 			customCount := MC.CrmMysql.Count(entity.CUSTOM, map[string]interface{}{
-				findKey:       id,
+				findKey:       employId,
 				"position_id": in.PositionId,
 			})
 			valueMap["customCount"] = customCount
 			if in.EmployType == 1 || in.EmployType == 4 {
 				//销售线索数量
 				clueCount := MC.CrmMysql.Count(entity.SALE_CLUE, map[string]interface{}{
-					"employ_info_id": id,
+					"employ_info_id": employId,
 					"position_id":    in.PositionId,
 				})
 				valueMap["clueCount"] = clueCount
@@ -123,7 +126,7 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) bool {
 						data["jybx_url"] = "/article/content/" + v1 + ".html"
 					} else if in.EmployType == 2 {
 						data = CustomFind(id, in.EmployType)
-						data["jybx_url"] = "swordfish/page_big_pc/svip/ent_ser_portrait/" + v1
+						data["jybx_url"] = "/swordfish/page_big_pc/svip/ent_ser_portrait/" + v1
 					} else if in.EmployType == 3 {
 						data = CustomFind(id, in.EmployType)
 						data["jybx_url"] = "/swordfish/page_big_pc/unit_portrayal/" + v1