From dd33745a7529d502350b25999862d6e9afece5a5 Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Tue, 12 Apr 2022 20:14:26 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B1=B0=EC=A3=BC=EC=9E=90/=EC=9E=A5?=
 =?UTF-8?q?=EC=95=A0=EC=9D=B8=20=EC=8B=AC=EC=9D=98=EB=8C=80=EC=83=81=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctgy/service/impl/ResidentAndDisabledService.java    | 9 +++++++++
 .../biz/ctgy/residentanddisabled-mapper.xml              | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java b/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java
index aa46ddf..f8f7678 100644
--- a/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java
+++ b/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java
@@ -39,6 +39,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toMap;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -201,6 +203,13 @@ public class ResidentAndDisabledService implements IResidentAndDisabledService {
             paramMap.put("msSeq", m.get("msSeq"));
             paramMap.put("msCarnum", m.get("msCarnum"));
             m.put("simsa", mapper.selectJudgeResultByCarnum(paramMap));
+//            Map<String,Object> usersMap = mapper.selectJudgeResultByCarnum(paramMap)
+//                    .stream()
+//                    .reduce((preMap, curMap) -> {
+//                        preMap.putAll(curMap);
+//                        return preMap;
+//                    }).orElse(null);
+//            m.putAll(usersMap);
         }).collect(Collectors.toList());
 
         resultMap.put("totUserList", totJudgeUserList);
diff --git a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml
index 58dc6d5..a0eccf5 100644
--- a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml
+++ b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml
@@ -78,6 +78,7 @@
            AND MSU.msu_team = #{msuTeam}
            AND MSU.msu_userid = MU.userid
          GROUP BY MSU.msu_userid, MU.name
+         ORDER BY MSU.msu_userid, MU.name
     </select>
 
     <select id="selectJudgeTargetByCarnum" parameterType="com.xit.biz.ctgy.dto.JudgeListDto" resultType="camelCaseLinkedMap">
@@ -126,6 +127,6 @@
           AND MSS.ms_carnum = #{msCarnum}
           AND MSU.msu_team = #{msuTeam}
           AND MSU.msu_userid = MU.userid
-        ORDER BY MSU.msu_userid, MU.userid
+        ORDER BY MSU.msu_userid, MU.name
     </select>
 </mapper>
\ No newline at end of file