견문관리 오류 수정.

강석 최 2022-10-20 15:04:23 +09:00
parent a6ed621285
commit 580952a95b
4 changed files with 13 additions and 6 deletions

View File

@ -204,8 +204,10 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
mav.addObject("userSeq",loginUser.getUserSeq()); mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("userOrgan", loginUser.getOgCd());
//메뉴권한 확인 //메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth()); mav.addObject("accessAuth", authMgtService.selectAccessConfigList
String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth(); (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth());
String apprvAuth = authMgtService.selectApprovalConfigList
(loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth();
mav.addObject("apprvAuth", apprvAuth); mav.addObject("apprvAuth", apprvAuth);
if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){ if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){
mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR")); mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR"));

View File

@ -16,9 +16,10 @@ $(function (){
function getSubPage(menuList){ function getSubPage(menuList){
$.each(menuList, function(idx, menu){ $.each(menuList, function(idx, menu){
if(idx<6){ if(idx<6){
const url = menu.menuUrl+(menu.menuUrl.includes('?')?'&dashboardFlag=true':'?dashboardFlag=true');
$.ajax({ $.ajax({
type : 'GET', type : 'GET',
url : menu.menuUrl+"?dashboardFlag=true", url : url,
dataType:"html", dataType:"html",
success : function(html) { success : function(html) {
$("#subPage"+idx).append(html); $("#subPage"+idx).append(html);

View File

@ -130,7 +130,10 @@ $(document).on('change', '.apprvChkbox', function (){
function getAffairViewModal(affairKey){ function getAffairViewModal(affairKey){
$.ajax({ $.ajax({
url: '/affair/affairViewModal', url: '/affair/affairViewModal',
data: {affairKey: affairKey}, data: {
affairKey: affairKey,
affairCategory: $("#affairCategory").val()
},
type: 'GET', type: 'GET',
dataType:"html", dataType:"html",
success: function(html){ success: function(html){

View File

@ -4,11 +4,12 @@
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header bg-white">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto">외사경찰 견문관리</div> <div class="col-auto" th:text="${#strings.concat((searchParams.affairCategory eq 'CAT215'?'외사경찰':'외사첩보망'), ' 견문관리')}"></div>
<div class="col-auto"><a href="/affair/affairMgt" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a th:href="|/affair/affairMgt?affairCategory=${searchParams.affairCategory}|" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<input type="hidden" id="affairCategory" th:value="${searchParams.affairCategory}">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>