Merge remote-tracking branch 'origin/master'

This commit is contained in:
com02 2021-11-30 18:18:58 +09:00
commit cbab7f9275
2 changed files with 33 additions and 8 deletions

View File

@ -4,6 +4,8 @@ import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import nlib.cmm.service.PagingVO;
import nlib.util.StringUtil;
@ -12,7 +14,9 @@ public class ArticleVO extends PagingVO {
private String articleId; /* 게시글ID */
private String mngOrgCd; /* 관리문화원코드 */
private String mngOrgNm; /* 관리문화원명 */
@JsonIgnore
private String bdType; /* 게시판유형 */
@JsonIgnore
private String bdTypeName; /* 게시판유형명 */
private String title; /* 제목 */
private String content; /* 내용 */
@ -20,33 +24,36 @@ public class ArticleVO extends PagingVO {
// 공지사항관련
private String notiYn; /* 공지여부 */
private String openYn; /* 공개여부 */
@JsonIgnore
private String postStartDate; /* 게시시작일자 */
@JsonIgnore
private String postEndDate; /* 게시종료일자 */
// FAQ, QNA관련
private String answer; /* 답변 */
private String answerYn; /* 답변여부 */
@JsonIgnore
private String useYn; /* 사용여부 */
private String questionType; /* 질문유형 */
private String questionTypeName; /* 질문유형명 */
private String secretYn; /* 비밀글여부 */
private String emailRecvYn; /* 답변이미엘수신여부 */
private String email; /* 이메일 */
private int viewCnt; /* 조회수 */
private String bdAttachFileId; /* 첨부파일아이디 */
private String attachYn; /* 첨부파일존재여부 */
private List<AttachFileVO> attachFiles; /* 첨부파일목록 */
private List<AttachFileVO> removedAttachFiles; /* 삭제첨부파일목록 */
@JsonIgnore
private String regId; /* 등록자아이디 */
private String regNm; /* 등록자명 */
private String regDd; /* 등록일자 */
@JsonIgnore
private String modId; /* 등록자아이디 */
private String modDd; /* 등록일자 */
private int rno; /* 글번호 */
@JsonIgnore
private String loginedMbInfoId; /* 로그인 사용자 ID */
private String loginedName; /* 로그인 사용자명 */
private String myQnaYn; /* 내가한 질문인지 여부 */
@ -55,13 +62,13 @@ public class ArticleVO extends PagingVO {
private String searchType; /* 검색대상구분 */
private String searchKeyword; /* 검색어 */
private String searchQuestionType; /* 검색FAQ유형 */
@JsonIgnore
private String searchMbInfoId; /* 로그인한 사용자ID */
// 처리결과 관련
private String resultMessage = null; /* 처리결과메시지 */
private String resultCode = null; /* 처리결과코드 */
public int getAttachFileCnt() {
if(attachFiles == null) return 0;
return attachFiles.size();

View File

@ -14,6 +14,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -32,9 +34,25 @@ public class AncmntController extends NlibCommonController
static final int DEFUALT_PAGE_SIZE = NlibProperty.getInt("list.paging.page.size", 10);
@Resource(name = "ancmntService")
//private AncmntServiceImpl ancmntService;
private BoardService ancmntService;
final String[] DISALLOWED_FIELDS = new String[] {
"mngOrgCd",
"mngOrgNm",
"bdType",
"title",
"content",
"notiYn",
"bdAttachFileId",
"attachYn",
"resultMessage",
"resultCode"
};
@InitBinder
public void initBinder(WebDataBinder binder) {
binder.setDisallowedFields(DISALLOWED_FIELDS);
}
/**
* 목록 화면을 표시한다.