From bb280237d95fa31f912b20c9174032ac0b330e4b Mon Sep 17 00:00:00 2001
From: nixj <nxj>
Date: Tue, 18 Jun 2024 09:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90add=E3=80=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EuserId=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/chint/application/dtos/system/RolePageDto.java | 1 +
 src/main/java/com/chint/domain/service/UserDomainService.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/chint/application/dtos/system/RolePageDto.java b/src/main/java/com/chint/application/dtos/system/RolePageDto.java
index 3aa2d6d0..48edd241 100644
--- a/src/main/java/com/chint/application/dtos/system/RolePageDto.java
+++ b/src/main/java/com/chint/application/dtos/system/RolePageDto.java
@@ -7,6 +7,7 @@ public class RolePageDto {
     private String name;
     private String employeeNo;
     private String roleName;
+    private Long userId;
     private Long roleId;
     private Long roleUserId;
     private String roleDesc;
diff --git a/src/main/java/com/chint/domain/service/UserDomainService.java b/src/main/java/com/chint/domain/service/UserDomainService.java
index 3f6252ec..489380c3 100644
--- a/src/main/java/com/chint/domain/service/UserDomainService.java
+++ b/src/main/java/com/chint/domain/service/UserDomainService.java
@@ -49,6 +49,7 @@ public class UserDomainService {
             RolePageDto obj = new RolePageDto();
             obj.setName(temp.getName());
             obj.setEmployeeNo(temp.getEmployeeNo());
+            obj.setUserId(temp.getUserId());
             List<RoleUser> roleUser = roleUsers.stream()
                     .filter(s -> s.getUserId().equals(temp.getUserId()))
                     .toList();