From ebe2da6e4eefd59b366ebab3a651b32763b580ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 22 六月 2025 14:23:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index c3ba3ae..b3a784b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -47,12 +47,12 @@
public Long getLoginUserId() {
User loginUser = getLoginUser();
- return loginUser == null ? null : loginUser.getId();
+ return loginUser == null ? 1 : loginUser.getId();
}
public Long getHostId() {
User loginUser = getLoginUser();
- return loginUser.getHostId();
+ return loginUser == null ? 1 : loginUser.getHostId();
}
public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
--
Gitblit v1.9.1