공지사항 게시판 활성화

src/main/java/com/lemon/lifecenter/controller/MobileLoginController.java

@@ -45,7 +45,7 @@ public class MobileLoginController extends LifeCenterController {
     private MobilePatientService patientService;
     
     @Autowired
-    private LifeCenterConfigVO config;
+    private RestApiService restApiService;
     
     @RequestMapping("/login")
     public ModelAndView login() {

src/main/resources/mybatis/mapper/board/board.xml

@@ -144,8 +144,8 @@
             SELECT FILE_NAME           AS fileName,
                    FILE_ORIGINAL_NAME  AS fileOriginalName
               FROM BOARD_ATTACH_FILE
-             WHERE POST_SEQ = ${postSeq}
-               AND BOARD_TYPE = ${boardType}
+             WHERE POST_SEQ = #{postSeq}
+               AND BOARD_TYPE = #{boardType}
         ]]>
     </select>
     <update id="updateFile" parameterType="BoardDTO">
@@ -236,7 +236,8 @@
                    (SELECT FILE_EXTENSION
                       FROM BOARD_ATTACH_FILE BAF
                     WHERE BAF.POST_SEQ = BR.POST_SEQ)            AS fileExtension,
-                   ANSWER_ID                                     AS answerId
+                   ANSWER_ID                                     AS answerId,
+                   ANSWER_CONTENT                                AS answerContent
               FROM BOARD_REQUEST BR
              WHERE 1 = 1
          ]]>

src/main/webapp/WEB-INF/jsp/include/sidebar.jsp

@@ -3,27 +3,27 @@
     pageEncoding="UTF-8"%>
     
 <script>
-$( function(){
-// localStorage.clear();
-    var lifeCenterNotice = localStorage.getItem( "notice" );
+// $( function(){
+// // localStorage.clear();
+//     var lifeCenterNotice = localStorage.getItem( "notice" );
     
-    if( lifeCenterNotice != "ok" ){
-        alertBox({ 
-            title : '<span class="" style="">공지<br/>(Notice)</span>', 
-            txt : '<div class="text-dark" style="line-height:30px;font-size:16px !important;color:#000;">' +
-                  '  <div>○ 생활치료센터 비대면진료시스템 콜센터 운영기간 안내</div> <span class="notice-en">시스템 이용문의 관련 콜센터 운영기간이 연중무휴로 연장되어 안내드립니다.</span>' + 
-                  '  <div class="mt-4">- 콜센터 운영 : (기존) 평일 9시~18시 → (변경) 연중무휴 9시~18시</div>' +
-                  '  <div class="mt-2">- 콜센터 번호 :  ☏ 1661-7551</div>' +
-                  '</div>' +
-                  '<br/><label id="check-notice"><input type="checkbox" id="life-center-notice" /> 다시보지않기 <label>', 
-            callBack : function( result ){
-                if( $( "#life-center-notice" ).prop( "checked" ) == true ){
-                    localStorage.notice = "ok";
-                }
-            }
-        });
-    }
-});
+//     if( lifeCenterNotice != "ok" ){
+//         alertBox({ 
+//             title : '<span class="" style="">공지<br/>(Notice)</span>', 
+//             txt : '<div class="text-dark" style="line-height:30px;font-size:16px !important;color:#000;">' +
+//                   '  <div>○ 생활치료센터 비대면진료시스템 콜센터 운영기간 안내</div> <span class="notice-en">시스템 이용문의 관련 콜센터 운영기간이 연중무휴로 연장되어 안내드립니다.</span>' + 
+//                   '  <div class="mt-4">- 콜센터 운영 : (기존) 평일 9시~18시 → (변경) 연중무휴 9시~18시</div>' +
+//                   '  <div class="mt-2">- 콜센터 번호 :  ☏ 1661-7551</div>' +
+//                   '</div>' +
+//                   '<br/><label id="check-notice"><input type="checkbox" id="life-center-notice" /> 다시보지않기 <label>', 
+//             callBack : function( result ){
+//                 if( $( "#life-center-notice" ).prop( "checked" ) == true ){
+//                     localStorage.notice = "ok";
+//                 }
+//             }
+//         });
+//     }
+// });
 </script>
 <style type="text/css">
 #check-notice{    font-size: 14px;
@@ -80,9 +80,11 @@ $( function(){
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "push"}'>active</c:if>">
                             <a class="sidebar-link" href="/push/list">푸시 서비스 관리(테스트)</a>
                         </li>
-                        <li class="sidebar-item <c:if test='${data._MENUPATH eq "notice"}'>active</c:if>">
-                            <a class="sidebar-link" href="/notice/list">공지사항</a>
-                        </li>
+                    </c:if>
+                    <li class="sidebar-item <c:if test='${data._MENUPATH eq "notice"}'>active</c:if>">
+                        <a class="sidebar-link" href="/notice/list">공지사항</a>
+                    </li>
+                    <c:if test="${data._SES_ID eq 'user'}">
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "qna"}'>active</c:if>">
                             <a class="sidebar-link" href="/qna/list">의견 게시판</a>
                         </li>

src/main/webapp/WEB-INF/jsp/qna/content.jsp

@@ -189,7 +189,7 @@ function goListPage(){
                                                         </td>
                                                     </c:if>
                                                     <c:if test="${content.answerContent ne ''}">
-                                                        <td colspan="3" style="white-space: pre-line;"><div id="answerContent"><c:out value="${content.answerContent}" /></div><textarea class="form-control" style="display:none;" id="answerContentHide" rows="2" cols="" name="answerContent" placeholder="내용을 입력하세요" maxlength="1000" required><c:out value="${item.content}" /></textarea></td>
+                                                        <td colspan="3" style="white-space: pre-line;"><div id="answerContent"><c:out value="${content.answerContent}" /></div><textarea class="form-control" style="display:none;" id="answerContentHide" rows="2" cols="" name="answerContent" placeholder="내용을 입력하세요" maxlength="1000" required><c:out value="${content.answerContent}" /></textarea></td>
                                                     </c:if>
                                                 </tr>
                                             </table>

src/main/webapp/WEB-INF/jsp/qna/list.jsp

@@ -111,7 +111,7 @@
                                                                 <td><c:out value="${pageNum}" /></td>
                                                                 <td class="text-left">
                                                                     <a href="./content?postSeq=${l.postSeq}"><c:out value="${l.title}" /></a>
-                                                                    <c:if test="${l.answerId ne ''}">
+                                                                    <c:if test="${l.answerContent ne ''}">
                                                                         <span class="badge badge-danger font-weight-normal" style="font-size:13px;">답변 완료</span>
                                                                     </c:if>
                                                                 </td>