From dd82e6f88608491b5e7a9eec424051e2e073f95e Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Thu, 2 Jun 2022 11:26:18 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20dashboard=20=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=8C=80=EC=83=81=20=EC=8B=AC=EC=9D=98?=
 =?UTF-8?q?=EC=A0=84=EC=9C=BC=EB=A1=9C=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/conf.yml                              | 2 +-
 src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml   | 2 ++
 .../mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/config/conf.yml b/src/main/resources/config/conf.yml
index 2f77382..3d295c9 100644
--- a/src/main/resources/config/conf.yml
+++ b/src/main/resources/config/conf.yml
@@ -17,7 +17,7 @@ api:
 file:
   cmm:
     upload:
-      root: /data/file/upload
+      root: c:/data/file/upload
 #      root: /Users/minuk/data/file/upload
       # 공지사항
       path: /kangnamSIM/simUpFile
diff --git a/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml b/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml
index b5a4e97..af65de3 100644
--- a/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml
+++ b/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml
@@ -187,9 +187,11 @@
              , (SELECT *
                   FROM (SELECT ms_edate
                           FROM min_simsa680
+                         WHERE MS_RESULT = '0'
                          ORDER BY ms_edate DESC)
                   WHERE ROWNUM = 1) T
          WHERE MS.ms_maincode = MSU.msu_maincode
+           AND MS.ms_result = '0'
            AND MSU.msu_userid = MU.userid
            AND MS.ms_edate = T.ms_edate
          GROUP BY MS.ms_edate, MSU.msu_team, MU.name
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 700d067..c3262a6 100644
--- a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml
+++ b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml
@@ -190,9 +190,11 @@
                   FROM (SELECT ms_edate
                           FROM min_simsa680_sc
                          WHERE ms_datagb = #{msDatagb}
+                           AND ms_result = '0'
                          ORDER BY ms_edate DESC)
                   WHERE ROWNUM = 1) T
          WHERE MS.MS_DATAGB = #{msDatagb}
+           AND MS.ms_result = '0'
            AND MS.ms_maincode = MSU.msu_maincode
            AND MSU.msu_userid = MU.userid
            AND MS.ms_edate = T.ms_edate