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 aab98eec..81f2ac5d 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
@@ -194,6 +194,12 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
affairBoard.setReportDt(LocalDate.now());
}
mav.addObject("affair", affairBoard);
+ //메뉴권한 확인
+ mav.addObject("userOrgan", loginUser.getOgCd());
+ mav.addObject("accessAuth", authMgtService.selectAccessConfigList
+ (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth());
+ mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList
+ (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth());
return mav;
}
@@ -215,9 +221,6 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
String apprvAuth = authMgtService.selectApprovalConfigList
(loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth();
mav.addObject("apprvAuth", apprvAuth);
- if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){
- mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR"));
- }
return mav;
}
diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java
index 48f0040b..be5531c1 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java
@@ -23,6 +23,8 @@ public class AffairRating{
@Id
@Column(name = "rating_organ")
private String ratingOrgan;
+ @Column(name = "section_title")
+ private String sectionTitle;
@Column(name = "section_nm")
private String sectionNm;
@Column(name = "section_apprv_dt")
@@ -31,6 +33,8 @@ public class AffairRating{
private String sectionApprv;
@Column(name = "section_etc")
private String sectionEtc;
+ @Column(name = "head_title")
+ private String headTitle;
@Column(name = "head_nm")
private String headNm;
@Column(name = "head_apprv_dt")
diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index dcbfe492..2962bcdc 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -111,6 +111,9 @@
.w-40{
width: 40%!important;
}
+.w-60{
+ width:60%!important;
+}
.w-70{
width:70%!important;
}
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
index b0972711..8a238673 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
@@ -117,6 +117,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 평가 정보가 없습니다.
+
+
+
+
+
+
+
+
+
+
+
+
+
+