From 15047d62d27fbe4f99b7f93292c2cf9709b7cc97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:53:39 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
index 01d500b..648abb0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
@@ -328,13 +328,13 @@
}
public Long[] getRoleIds() {
- if (Cools.isEmpty((Object) this.roleIds)) {
- UserRoleService service = SpringUtils.getBean(UserRoleService.class);
- List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
- return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
- } else {
- return this.roleIds;
- }
+ return this.roleIds;
+ }
+
+ public Long[] getUserRoleIds() {
+ UserRoleService service = SpringUtils.getBean(UserRoleService.class);
+ List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
+ return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
}
@Override
--
Gitblit v1.9.1