외사활동 목록조회 쿼리 수정

저장시 예외처리 동작 수정

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

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;
   }
 

src/main/resources/mybatisMapper/ActivityCaseMapper.xml

@@ -34,6 +34,12 @@
           and b.wrt_dt <= #{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