From 79d5e91444eca538d523d3bd014528abd939da33 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 八月 2025 18:54:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 13b6d0b..9f09c6f 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
@@ -93,18 +93,18 @@
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
- throw new ServiceException("您所属门店已被冻结，请联系平台");
+ throw new ServiceException("您的账号已被停用，请联系平台");
}
- if (user.getRoleType()==2){
- Shop data = shopClient.getShopById(user.getObjectId()).getData();
- if (data==null){
- throw new ServiceException("门店不存在");
- }else{
- if (data.getStatus()==2){
- throw new ServiceException("您所属门店已被冻结，请联系平台");
- }
- }
- }
+// if (user.getRoleType()==2){
+// Shop data = shopClient.getShopById(user.getSiteId()).getData();
+// if (data==null){
+// throw new ServiceException("站点不存在");
+// }else{
+// if (data.getStatus()==2){
+// throw new ServiceException("您所属门店已被冻结，请联系平台");
+// }
+// }
+// }
passwordService.validate(user, password, request);
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
return userInfo;
--
Gitblit v1.7.1