From f28b3a9131d2313a889f4a3156dcfabcefce7a84 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 30 十二月 2023 13:41:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
index 4960cac..d17f8ba 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
@@ -123,16 +123,12 @@
}
// 璇锋眰缂撳瓨
request.setAttribute("userId", user.getId());
+ request.setAttribute("hostId", userLogin.getHostId());
// 鏇存柊 token 鏈夋晥鏈�
userLogin.setCreateTime(new Date());
userLoginService.updateById(userLogin);
// 鎿嶄綔鏃ュ織
if (!Cools.isEmpty(memo)) {
- // 杩涜婵�娲诲垽鏂�
- if (!SystemProperties.SYSTEM_ACTIVATION) {
- Http.response(response, BaseRes.NO_ACTIVATION);
- return false;
- }
// 璁板綍鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
--
Gitblit v1.9.1