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

api/internal/service/employService.go

@@ -173,7 +173,7 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 					//收录新增
 					data := map[string]interface{}{}
 					if in.EmployType == 1 || in.EmployType == 4 {
-						data = infoFind(id, employ.SourceId)
+						data = infoFind(id, employ.Id)
 					} else if in.EmployType == 2 {
 						data = customFind(id, in.EmployType)
 						data["jybx_url"] = "/swordfish/page_big_pc/ent_portrait/" + employ.Id
@@ -264,6 +264,7 @@ func infoFind(id string, v1 string) map[string]interface{} {
 	//标讯信息
 	obj := map[string]interface{}{}
 	aobj := elastic.Get(INDEX, TYPE, fmt.Sprintf(`{"query":{"bool":{"must":[{"match":{"id":"%s"}}],"must_not":[],"should":[]}},"from":0,"size":10,"_source":["_id","purchasinglist","projectname","projectcode","title","s_winner","buyertel","bidstatus","site","bidamount","toptype","winneraddr","winner","agency","buyer","detail","city","subtype","buyerclass","href","comeintime","winnertel","area","publishtime","buyeraddr","agencytel","budget","entidlist","buyerperson","winnerperson","agencyaddr","recommended_service","competehref","owner","total_investment","projectaddr","projectperiod","approvedept","approvecontent","approvecode","approvenumber","approvetime","approvestatus","project_scale"],"sort":[],"aggs":{}}`, id))
+	log.Println(len(*aobj))
 	if aobj != nil || *aobj != nil || len(*aobj) > 0 {
 		obj = (*aobj)[0]
 	}