From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
index 821dcd9..5eb4c42 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
@@ -31,10 +31,13 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String userId = context.getReqHeaders().get("user-id");
- String storeId = context.getReqHeaders().get("store-id");
+ //String storeId = context.getReqHeaders().get("store-id");
+
+ if(StringUtil.isEmpty(userId)){
+ userId = reqJson.getString("userId");
+ }
Assert.hasLength(userId, "鏈寘鍚敤鎴�");
- Assert.hasLength(storeId, "鏈寘鍚晢鎴�");
}
@Override
@@ -46,6 +49,11 @@
if(StringUtil.isEmpty(userId)){
userId = reqJson.getString("userId");
}
+
+ if(reqJson.containsKey("staffId") && !StringUtil.isEmpty(reqJson.getString("staffId"))){
+ userId = reqJson.getString("staffId");
+ }
+
String domain = "";
if(!reqJson.containsKey("domain") || StringUtil.isEmpty(reqJson.getString("domain"))) {
--
Gitblit v1.8.0