From 8f6576fd595f67a3b17ef2e5e8054e8f194078f7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 九月 2024 20:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index cf9ee4b..1c44f0d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -763,8 +763,8 @@
try {
SmRoleDTO smRoleDTO = new SmRoleDTO();
BeanUtil.copy(smRolePO,smRoleDTO);
- //SessionInfo loginUser = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
- String userId = "developer";//loginUser.getUserId();
+ SessionInfo loginUser = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String userId = loginUser.getUserId();
//瑙掕壊绫诲瀷锛岃繖閲岃缃簡浼氬湪changeRoleObjectToRoleInfo涓浆鎹�
if(UserTypeEnum.SUPPER_ADMIN.getValue().equals("0")){
smRoleDTO.setRoleClassify(RoleClassifyEnum.MANAGE.getValue());
--
Gitblit v1.9.3