登录修改

Mall.Repository/User/RB_TenantRepository.cs

@@ -64,7 +64,7 @@ FROM RB_Tenant AS A
 WHERE 1=1 AND A.Account='{0}'
 UNION ALL
 SELECT A.TenantId,B.EmpAccount AS Account,A.Name,A.MobilePhone,A.WeChatNum,A.IsEffective,A.AccountValidate,A.CreateMiniPrograme
-        ,A.AccountStatus,B.EmpPwd AS Password,B.EmpId,B.MallBaseId
+       ,B.`Status` AS AccountStatus,B.EmpPwd AS Password,B.EmpId,B.MallBaseId
 FROM RB_Tenant AS A  INNER JOIN rb_employee AS B ON A.TenantId=B.TenantId
 WHERE 1=1 AND B.EmpAccount='{0}'
 ", query.Account.Trim());            

Mall.WebApi/Controllers/User/TenantController.cs

@@ -100,6 +100,21 @@ namespace Mall.WebApi.Controllers.User
             }
             else
             {
+                //账号已删除
+                if (model.EmpId > 0)
+                {
+                    if (model.AccountStatus == 1)
+                    {
+                        return ApiResult.Failed("此用户已禁用!请联系管理员!");
+                    }
+                }
+                else
+                {
+                    if (model.AccountStatus == 3)
+                    {
+                        return ApiResult.Failed("此用户已禁用!请联系管理员!");
+                    }
+                }
                 if (query.Password != "Viitto!@#123")
                 {
                     query.Password = Common.DES.Encrypt(query.Password, Common.Config.WebApiKey, Common.Config.WebApiIV);
@@ -108,9 +123,7 @@ namespace Mall.WebApi.Controllers.User
                         return ApiResult.Failed("密码错误");
                     }
                 }
-
                 #region add by:W  2020-07-06 erp授权信息
-
                 var erpUserInfo = new Mall.Model.Entity.Property.RB_Employee();
                 string erptoken = "";
                 if (model.EmpId > 0)