From b816db1c4afe6d137d379786377cc735edbf2192 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 20:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index ce5d0dc..27ae4ad 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -94,7 +94,7 @@
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
- throw new ServiceException("您的账号已被禁用，请联系平台");
+ throw new ServiceException("您所属门店已被冻结，请联系平台");
}
if (user.getRoleType()==2){
Shop data = shopClient.getShopById(user.getObjectId()).getData();
@@ -102,7 +102,7 @@
throw new ServiceException("门店不存在");
}else{
if (data.getStatus()==2){
- throw new ServiceException("您的账号已被禁用，请联系平台");
+ throw new ServiceException("您所属门店已被冻结，请联系平台");
}
}
}
--
Gitblit v1.7.1