From a37361bdd8ff423a4c321dbe1ab192531423ac5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Tue, 30 May 2023 19:01:34 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=A9=EC=B2=A9=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=83=81=20=EC=88=9C=EB=B2=88=20=EA=B7=9C?= =?UTF-8?q?=EC=B9=99=20=EB=B3=80=EA=B2=BD=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=97=90=20=EA=B2=AC=EB=AC=B8=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80=20=EA=B2=AC?= =?UTF-8?q?=EB=AC=B8=20=EC=9E=91=EC=84=B1=EC=8B=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=EC=9D=98=20=EA=B2=AC=EB=AC=B8?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=EC=98=B5=EC=85=98=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20=EA=B2=B0=EC=9E=AC=EA=B8=B0=EA=B4=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/fpiMgt/affair/AffairController.java | 2 -- .../fpiMgt/affair/service/AffairService.java | 25 +++++++++++++++++-- .../organMgt/service/OrganConfigService.java | 4 +++ .../userInfo/service/UserInfoService.java | 3 +++ .../adminPage/userMgt/userEditModal.html | 22 +++++++++++----- .../counterIntelligence/ciaEduList.html | 2 +- .../counterIntelligence/ciaForeignerList.html | 2 +- .../ciaManageCompanyList.html | 3 +-- .../ciaSafetyDemandList.html | 2 +- 9 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index 14d91d0b..4edac085 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -44,11 +44,9 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 switch (tab){ case "myReport": affairBoard.setWrtUserSeq(loginUser.getUserSeq()); - affairBoard.setRatingOrgan(loginUser.getOgCd()); break; case "stayReport": if(Utils.isEmpty(apprvAuth)) { - affairBoard.setRatingOrgan(loginUser.getOgCd()); affairBoard.setWrtUserSeq(loginUser.getUserSeq()); affairBoard.setQueryType("normalStayList"); }else { diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index c2361c3b..97fe3ac2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -9,8 +9,10 @@ import com.dbnt.faisp.main.fpiMgt.affair.mapper.AffairMapper; import com.dbnt.faisp.main.fpiMgt.affair.model.*; import com.dbnt.faisp.main.fpiMgt.affair.repository.*; import com.dbnt.faisp.main.hashTag.service.HashTagService; +import com.dbnt.faisp.main.organMgt.model.OrganConfig; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.repository.UserInfoRepository; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; @@ -28,6 +30,7 @@ public class AffairService extends BaseService { // 견문보고 private final UserAlarmService userAlarmService; private final HashTagService hashTagService; + private final UserInfoRepository userInfoRepository; private final OrganConfigService organConfigService; private final CodeMgtService codeMgtService; private final AffairBoardRepository affairBoardRepository; @@ -73,11 +76,29 @@ public class AffairService extends BaseService { // 견문보고 saveUploadFiles(affairKey, affair.getMultipartFileList()); } - AffairRating rating = affairRatingRepository.findById(new AffairRating.AffairRatingId(affairKey,affair.getWrtOrgan())).orElse(null); + // 230530 사용자 정보에 견문결재기관 정보가 추가되어 관련 로직 추가. + UserInfo wrtUser = userInfoRepository.findById(affair.getWrtUserSeq()).orElse(new UserInfo()); + String ratingOrgan = affair.getWrtOrgan(); + switch (wrtUser.getAffairOrgan()){ + //소속서는 switch 탈 필요 없음. + case "ARO002": //지방청 + OrganConfig organInfo = organConfigService.selectOrganConfig(ratingOrgan); + if(organInfo.getOrganType().equals("OGC003")){ + // 소속기관이 말단 서일 때 상위청으로 결재기관 설정. + // 지방청이나 본청 사용자는 결재기관을 지방청으로 설정하더라도 소속기관으로 결재기관이 설정됨. + ratingOrgan = organInfo.getParentOrgan(); + } + break; + case "ARO003": //본청 + ratingOrgan = "OG001"; + break; + } + + AffairRating rating = affairRatingRepository.findById(new AffairRating.AffairRatingId(affairKey, ratingOrgan)).orElse(null); if(rating == null){ rating = new AffairRating(); rating.setAffairKey(affairKey); - rating.setRatingOrgan(affair.getWrtOrgan()); + rating.setRatingOrgan(ratingOrgan); } rating.setAffairStatus(affair.getAffairStatus()); affairRatingRepository.save(rating); diff --git a/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java index ced37cd9..42357722 100644 --- a/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java @@ -79,4 +79,8 @@ public class OrganConfigService { .collect(Collectors.toList()); return configList; } + + public OrganConfig selectOrganConfig(String organCd) { + return organConfigRepository.findById(organCd).orElse(null); + } } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java index a5c6274f..1cc03f92 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java @@ -130,6 +130,9 @@ public class UserInfoService implements UserDetailsService { if(!Utils.isEmpty(userInfo.getSpecialism())){ savedInfo.setSpecialism(userInfo.getSpecialism()); } + if(!Utils.isEmpty(userInfo.getAffairOrgan())){ + savedInfo.setAffairOrgan(userInfo.getAffairOrgan()); + } userInfoRepository.save(savedInfo); saveUserInfoHistory(savedInfo, loginUser); } diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 35c1f3fb..4f1d4079 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -183,22 +183,32 @@
- +
-
- +
- +
- +
- + +
+
+
+ +
+
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduList.html b/src/main/resources/templates/counterIntelligence/ciaEduList.html index 603c5dca..1ff7d826 100644 --- a/src/main/resources/templates/counterIntelligence/ciaEduList.html +++ b/src/main/resources/templates/counterIntelligence/ciaEduList.html @@ -87,7 +87,7 @@ - + diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html index da8b3863..cc9c62dc 100644 --- a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html +++ b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html @@ -96,7 +96,7 @@ - + diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html index 3495929f..d03d59a9 100644 --- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html +++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html @@ -76,7 +76,6 @@ 순번 관서 - 업체명 소재지 관련
분야 @@ -89,7 +88,7 @@ - + diff --git a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html index e7c0b69c..3649c238 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html +++ b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html @@ -82,7 +82,7 @@ - +