1

services/jl_service.go

@@ -239,9 +239,7 @@ func (s *JlService) AuthLogin(claimsData *viewmodels.Jl, writer http.ResponseWri
 	}
 	// 2-1.账号停用
 	if projectAccountInfo.Enable == 0 {
-		pa := &viewmodels.ProjectAccount{}
-		pa.Enable = 0
-		return pa, errors.New("该账号已被停用")
+		return nil, errors.New("该账号已被停用")
 	}
 
 	// 加密用户标识

web/external/jl_ex.go

@@ -156,11 +156,12 @@ func (c *JlEx) PostAuthLogin() {
 	result, err := JlService.AuthLogin(claimsData, c.Ctx.ResponseWriter())
 	if err != nil {
 		code := -1
-		if result.Enable == 0 {
+		errString := fmt.Sprintf("%s", err)
+		if errString == "该账号已被停用" {
 			// 计量跳转代表账号停用
 			code = 3
 		}
-		c.Ctx.JSON(iris.Map{"code": code, "msg": fmt.Sprintf("%s", err), "data": map[string]string{
+		c.Ctx.JSON(iris.Map{"code": code, "msg": errString, "data": map[string]string{
 			"redirect": AuthUrl,
 		}})
 		return