From 0774ea976b6aa86a8a7de334fa24fbd7524295d5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:57:11 +0800
Subject: [PATCH] 看板统计
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 60ba2c4..16895bd 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
@@ -284,11 +284,15 @@
if (R.FAIL == userResult.getCode()) {
throw new ServiceException(userResult.getMsg());
}
+// ShopRelUserVo shopInfo = shopResult.getData();
+// if(null == shopInfo){
+// throw new ServiceException("未查询到商户信息");
+// }
+// userInfo.setShopId(shopInfo.getShopId());
ShopRelUserVo shopInfo = shopResult.getData();
- if(null == shopInfo){
- throw new ServiceException("未查询到商户信息");
+ if(null != shopInfo){
+ userInfo.setShopId(shopInfo.getShopId());
}
- userInfo.setShopId(shopInfo.getShopId());
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
return userInfo;
}
--
Gitblit v1.7.1