diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java index 8032d481..c41d7b7d 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java @@ -134,6 +134,7 @@ public class PublicBoardController { publicBoard.setWrtOrgan(loginUser.getOgCd()); publicBoard.setWrtPart(loginUser.getOfcCd()); publicBoard.setWrtUserSeq(loginUser.getUserSeq()); + publicBoard.setWrtUserGrd(loginUser.getTitleCd()); publicBoard.setWrtUserNm(loginUser.getUserNm()); publicBoard.setWrtDt(LocalDateTime.now()); } @@ -177,6 +178,7 @@ public class PublicBoardController { comment.setWrtOrgan(loginUser.getOgCd()); comment.setWrtPart(loginUser.getOfcCd()); comment.setWrtUserSeq(loginUser.getUserSeq()); + comment.setWrtUserGrd(loginUser.getTitleCd()); comment.setWrtUserNm(loginUser.getUserNm()); comment.setWrtDt(LocalDateTime.now()); publicBoardService.saveComment(comment); diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java index 12fa85db..49ed7f8f 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java @@ -37,6 +37,8 @@ public class PublicBoard extends BaseModel { private String wrtPart; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; + @Column(name = "wrt_user_grd") + private String wrtUserGrd; @Column(name = "wrt_user_nm") private String wrtUserNm; @Column(name = "wrt_dt") diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java index 6c1d0929..eab13942 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java @@ -32,6 +32,8 @@ public class PublicComment { private String wrtPart; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; + @Column(name = "wrt_user_grd") + private String wrtUserGrd; @Column(name = "wrt_user_nm") private String wrtUserNm; @Column(name = "wrt_dt") diff --git a/src/main/resources/mybatisMapper/PublicBoardMapper.xml b/src/main/resources/mybatisMapper/PublicBoardMapper.xml index ee9ad680..73c630a0 100644 --- a/src/main/resources/mybatisMapper/PublicBoardMapper.xml +++ b/src/main/resources/mybatisMapper/PublicBoardMapper.xml @@ -15,6 +15,9 @@ AND a.title LIKE CONCAT('%', #{title}, '%') + + AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%') + and a.wrt_dt >= #{startDate}::date @@ -53,6 +56,7 @@ a.wrt_organ, a.wrt_part, a.wrt_user_nm, + a.wrt_user_grd, a.wrt_user_seq, a.wrt_dt, a.organ_chk, diff --git a/src/main/resources/static/img/logo2.png b/src/main/resources/static/img/logo2.png new file mode 100644 index 00000000..9437c986 Binary files /dev/null and b/src/main/resources/static/img/logo2.png differ diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index ea8b2f2b..f4d5d88b 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -2,38 +2,70 @@ -
-
- - - - +
+
+
+
+ + + +
-
-
+
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index cc4068dd..14f2781f 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -1,9 +1,6 @@
- - -