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

api/internal/service/employService.go

@@ -54,7 +54,7 @@ func (e *EmPloyService) InfoEmployinfo(in *types.InfoEmployinfoReq) []map[string
 		table, findKey, employKey, source, projectId, isNiJian := employKeyFormat(in.EmployType, id)
 		if id == "" {
 			log.Println(v, in.EmployType, "该信息查询不到数据")
-			break
+			continue
 		}
 		if in.EntNicheDis > 0 {
 			data = append(data, employInfoEnt(v, table, id, employKey, findKey, depIDArr, source, in, projectId, isNiJian))
@@ -88,7 +88,7 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 			}
 			if id == "" {
 				log.Println(v1, in.EmployType, "该信息查询不到数据")
-				break
+				continue
 			}
 			if in.IsEmploy {
 				if MC.CrmMysql.Count(table, findMap) > 0 {
@@ -116,7 +116,7 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 					ok := MC.CrmMysql.InsertByTx(tx, table, data)
 					if ok <= 0 {
 						log.Println(v1, id, in.EmployType, "收录失败")
-						break
+						continue
 					}
 				}
 				fool = true
@@ -138,7 +138,6 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 					}
 				}
 			}
-			return fool
 		}
 		return fool
 	}), msg
@@ -350,7 +349,7 @@ func (e *EmPloyService) IgnoreOperate(in *types.IgnoreOperateReq) (bool, string)
 		id := idFormat(v, in.EmployType)
 		if id == "" {
 			log.Println(v, id, in.EmployType, "忽略处理，id解析失败")
-			break
+			continue
 		}
 		findMap := map[string]interface{}{
 			"position_id": in.PositionId,
@@ -376,7 +375,7 @@ func (e *EmPloyService) IgnoreOperate(in *types.IgnoreOperateReq) (bool, string)
 					msg = "该企业已有员工收录，不可取消忽略。"
 				}
 			}
-			break
+			continue
 		}
 		if in.IsIgnore {
 			MC.CrmMysql.Update(table, findMap, map[string]interface{}{