From ccaec40ca61e3626ac2c928681fd7b2a63acc267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 7 Mar 2023 09:19:41 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=ED=99=9C=EB=8F=99=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=A0=80=EC=9E=A5=EC=8B=9C=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EB=8F=99=EC=9E=91=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activityCase/ActivityCaseController.java         |  1 +
 .../activityCase/service/ActivityCaseService.java    | 12 ++++++++----
 .../resources/mybatisMapper/ActivityCaseMapper.xml   |  8 +++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java
index 7c347399..0e85cd78 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java
@@ -39,6 +39,7 @@ public class ActivityCaseController {
     mav.addObject("ogCd", loginUser.getOgCd());
     activityCase.setWrtOrgan(loginUser.getOgCd());
     activityCase.setQueryInfo();
+    activityCase.setDownOrganCdList(loginUser.getDownOrganCdList());
     mav.addObject("activityCaseList", activityCaseService.selectActivityCaseList(activityCase));
     activityCase.setContentCnt(activityCaseService.selectActivityCaseCnt(activityCase));
     activityCase.setPaginationInfo();
diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
index 95759272..439a7f45 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
@@ -73,11 +73,15 @@ public class ActivityCaseService extends BaseService {
     activityCaseInfo.setWrtDt(LocalDateTime.now());
     Integer caseKey = aciRepository.save(activityCaseInfo).getCaseKey();
     deleteActivityCaseFile(caseKey, deleteFileSeq);
-    saveUploadFiles(caseKey, activityCaseInfo.getMultipartFileList());
-    for(ActivityCaseApprv apprv: activityCaseInfo.getApprvList()){
-      apprv.setCaseKey(caseKey);
+    if(activityCaseInfo.getMultipartFileList()!=null && activityCaseInfo.getMultipartFileList().size()>0){
+      saveUploadFiles(caseKey, activityCaseInfo.getMultipartFileList());
+    }
+    if(activityCaseInfo.getApprvList()!=null && activityCaseInfo.getApprvList().size()>0){
+      for(ActivityCaseApprv apprv: activityCaseInfo.getApprvList()){
+        apprv.setCaseKey(caseKey);
+      }
+      acaRepository.saveAll(activityCaseInfo.getApprvList());
     }
-    acaRepository.saveAll(activityCaseInfo.getApprvList());
     return caseKey;
   }
 
diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
index 70e8fce2..06f47fc5 100644
--- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
+++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
@@ -34,6 +34,12 @@
           and b.wrt_dt &lt;= #{endDate}::date+1
         </if>
       </if>
+      <if test="downOrganCdList != null">
+        and a.wrt_organ in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </if>
     </where>
   </sql>
   <select id="selectActivityCaseList" parameterType="ActivityCaseBoard" resultType="ActivityCaseBoard">
@@ -63,7 +69,7 @@
         from activity_case_apprv
         group by case_key
       ) c on b.case_key = c.case_key
-      inner join (
+      left outer join (
         select case_key, count(*) as fileCnt
         from activity_case_file
         group by case_key