유저 목록 수정

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() {

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>