From 358e12a2225270badfa00a31ebd5c55d41cfeead Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Mon, 3 Feb 2025 15:09:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common/UserController.java      | 11 +++++++----
 src/main/resources/mapper/netmemberMapper.xml  | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java
index 604463e..5ee4e07 100644
--- a/src/main/java/io/company/localhost/controller/common/UserController.java
+++ b/src/main/java/io/company/localhost/controller/common/UserController.java
@@ -206,13 +206,16 @@ public class UserController {
      */
     @ParameterCheck
     @GetMapping("/allUserList")
-    public ApiResponse<List<MapDto>> getallUserList() {
+    public ApiResponse<MapDto> getallUserList() {
         List<MapDto> allUserList = netmemberservice.getallUserList();
-        return ApiResponse.ok(allUserList);
+    	MemberVo user = AuthUtil.getUser();
+    	
+    	MapDto outData = new MapDto();
+    	outData.put("allUserList", allUserList);
+    	outData.put("user", user);
+        return ApiResponse.ok(outData);
     }
 
- 
-
 	@Guest
 	@GetMapping("get1")
 	public ApiResponse<?> getAuthTest1() {
diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml
index e79edec..25c68d5 100644
--- a/src/main/resources/mapper/netmemberMapper.xml
+++ b/src/main/resources/mapper/netmemberMapper.xml
@@ -94,17 +94,23 @@
 	    FROM netmember
 	    WHERE MEMBERIDS = #{memberIds}
 	</select>
-	
+	<!-- 전체 회원 목록 -->
 	<select id="getallUserList" resultType="Map">
-		SELECT *
+		SELECT 
+			m.*
+			,c.CMNCODNAM usercolor
 		FROM 
-			netmember
+			netmember m
+		left join 
+			commoncod c 
+		on 
+			M.MEMBERCOL = C.CMNCODVAL 
 		WHERE 
-			MEMBERDEL = "N"
+			m.MEMBERDEL = "N"
 		AND 
-			MEMBERPRM = "Y"
+			m.MEMBERPRM = "Y"
 		AND 
-			MEMBERLEA ="N"
+			m.MEMBERLEA ="N"
 	</select>