Merge branch 'feature/v1.0.1' of https://jygit.jydev.jianyu360.cn/CRM/application into feature/v1.0.1

api/internal/service/employService.go

@@ -96,7 +96,7 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 	//summaryMap := SummaryFormat(in.PositionId)
 	msg := ""
 	return MC.CrmMysql.ExecTx("收录操作", func(tx *sql.Tx) bool {
-		fool := true
+		fool := false
 		for _, v1 := range strings.Split(in.IdArr, ",") {
 			//id转中文
 			id := ""
@@ -154,17 +154,23 @@ func (e *EmPloyService) EmployOperate(in *types.EmployOperateReq) (bool, string)
 					})
 					if !ok {
 						log.Println(v1, id, in.EmployType, "取消收录失败")
+						continue
 					}
+					fool = true
 				} else {
-					fool = false
 					if in.EmployType == 1 {
 						msg = "该资讯已有员工收录，不可取消收录。"
+						continue
 					} else {
 						msg = "该企业已有员工收录，不可取消收录。"
+						continue
 					}
 				}
 			}
 		}
+		if in.IsEmploy && !fool {
+			msg = "收录失败"
+		}
 		return fool
 	}), msg
 }