From a6c962f1c6e14984f2bbc2f3e43fa85947d3cb0a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 25 三月 2023 00:26:41 +0800
Subject: [PATCH] 支持厂拍门禁
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java
index 64d8b4e..a8498b3 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java
@@ -42,6 +42,9 @@
UserStorehouseDto userStorehouseDto = BeanConvertUtil.covertBean(reqJson, UserStorehouseDto.class);
//鑾峰彇鐢ㄦ埛id
String userId = reqJson.getString("userId");
+ if(StringUtil.isEmpty(userId)){
+ userId = context.getReqHeaders().get("user-id");
+ }
List<Map> privileges = null;
//鏌ョ湅鎵�鏈変釜浜虹墿鍝佹潈闄�
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
@@ -55,7 +58,7 @@
//杞鍙煡璇㈣嚜宸辩殑鐗╁搧
if (!StringUtil.isEmpty(reqJson.getString("giveType")) && "1".equals(reqJson.getString("giveType"))) {
userStorehouseDto.setUserId(reqJson.getString("userId"));
- userStorehouseDto.setUserName(reqJson.getString("userName"));
+ userStorehouseDto.setUserName(reqJson.getString("searchUserName"));
}
userStorehouseDto.setLagerStockZero("1");
--
Gitblit v1.8.0