From d5583722362b7641f8235fbafe05b75daceca2d6 Mon Sep 17 00:00:00 2001
From: s-tajihi <2026_04_00508@it-college.co.jp>
Date: Mon, 28 Sep 2026 09:37:58 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[edit]=20=E7=A4=BE=E5=86=85=E5=9B=B3?=
 =?UTF-8?q?=E6=9B=B8=E4=B8=80=E8=A6=A7=E7=94=BB=E9=9D=A2=E2=86=92=E3=83=88?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html
index 1a02ff4..569e4e1 100644
--- a/src/main/resources/templates/book.html
+++ b/src/main/resources/templates/book.html
@@ -10,7 +10,9 @@
 <body>
 	<div class="container">
 		<h1>社内図書一覧</h1>
+
 		<div class="float-end">
+			<a th:href="@{/topmenu}">トップメニューへ</a>
 		</div>
 
 		<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
@@ -22,13 +24,13 @@
 			</button>
 
 		</form>
-		
+
 		<form method="post" th:action="@{/clearBookList}">
 			<button class="button button-secondary" type="submit">
 				クリア
 			</button>
 		</form>
-		
+
 		<p>※「タイトル」「出版社」「著者名」で検索</p>
 
 
@@ -99,7 +101,7 @@
 							</form>
 						</td>
 					</tr>
-					
+
 					<tr th:if="${#lists.isEmpty(book)}">
 						<td colspan="15">
 							該当する図書がありません
@@ -110,7 +112,7 @@
 
 
 
-
+	</div>
 </body>
 
 </html>
\ No newline at end of file

From 79fd664f86d44ee818ffcc05ae6e5258d63b31e2 Mon Sep 17 00:00:00 2001
From: s-tajihi <2026_04_00508@it-college.co.jp>
Date: Mon, 28 Sep 2026 11:34:02 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[edit]=20HTML=E8=A1=A8=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=88=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E5=88=A4=E5=88=A5=EF=BC=89=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/entity/AccountEntity.java    |  7 +++-
 .../demo/repository/AccountRepository.java    |  2 +-
 .../example/demo/service/LoginService.java    |  2 +-
 src/main/resources/templates/book.html        | 41 +++++++++++++++----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/demo/entity/AccountEntity.java b/src/main/java/com/example/demo/entity/AccountEntity.java
index fc90022..03bbc9b 100644
--- a/src/main/java/com/example/demo/entity/AccountEntity.java
+++ b/src/main/java/com/example/demo/entity/AccountEntity.java
@@ -5,6 +5,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 import lombok.Getter;
@@ -28,8 +30,9 @@ public class AccountEntity {
 	@Column(name="login_info_id")
 	private Integer loginInfoId;
 	
-	@Column(name="employee_id")
-	private Integer employeeId;
+	@ManyToOne
+	@JoinColumn(name = "employee_id")
+	private Employee employee;
 	
 	@Column(name="password_hash")
 	private String passwordHash;
diff --git a/src/main/java/com/example/demo/repository/AccountRepository.java b/src/main/java/com/example/demo/repository/AccountRepository.java
index db7d155..0e572b2 100644
--- a/src/main/java/com/example/demo/repository/AccountRepository.java
+++ b/src/main/java/com/example/demo/repository/AccountRepository.java
@@ -6,6 +6,6 @@ import com.example.demo.entity.AccountEntity;
 
 public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
 	
-	AccountEntity findByEmployeeId (Integer employeeId);
+	AccountEntity findByEmployee_EmployeeId (Integer employeeId);
 
 }
diff --git a/src/main/java/com/example/demo/service/LoginService.java b/src/main/java/com/example/demo/service/LoginService.java
index c87eead..27756fb 100644
--- a/src/main/java/com/example/demo/service/LoginService.java
+++ b/src/main/java/com/example/demo/service/LoginService.java
@@ -16,7 +16,7 @@ public class LoginService {
 	
 	public AccountEntity login(LoginForm form) {
 		AccountEntity accountEntity = 
-				accountRepository.findByEmployeeId(form.getEmployeeId());
+				accountRepository.findByEmployee_EmployeeId(form.getEmployeeId());
 		
 		if(accountEntity == null) {
 			return null;
diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html
index 569e4e1..9598a48 100644
--- a/src/main/resources/templates/book.html
+++ b/src/main/resources/templates/book.html
@@ -8,6 +8,28 @@
 </head>
 
 <body>
+	
+	<div class="header-bar">
+
+			<div class="header-left">
+				ShareBooks
+			</div>
+
+			<div class="header-right">
+
+				<span class="user">
+					<span th:text="${session.loginEmployee.employee.employeeName}"></span>
+					(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
+				</span>
+
+				<a class="button-link" th:href="@{/logout}">
+					ログアウト
+				</a>
+
+			</div>
+
+		</div>
+		
 	<div class="container">
 		<h1>社内図書一覧</h1>
 
@@ -34,9 +56,6 @@
 		<p>※「タイトル」「出版社」「著者名」で検索</p>
 
 
-
-		<form method="get" action="bookLend">
-
 			<table class="table table-striped">
 				<thead>
 					<tr>
@@ -54,7 +73,7 @@
 						<th>更新日時</th>
 						<th>寄贈者</th>
 						<th>貸出状態</th>
-						<th>操作</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
 				</thead>
 
@@ -83,7 +102,8 @@
 						<td
 							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
 						</td>
-						<td>
+						
+						<td th:if="${session.loginEmployee.adminFlag == 1}">
 							<form method="post" action="/bookLend">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit"
@@ -93,11 +113,15 @@
 							</form>
 							<form method="post" action="/updateconfirm">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">更新</button>
+								<button type="submit">
+									更新
+								</button>
 							</form>
 							<form method="get" action="/delete">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">削除</button>
+								<button type="submit">
+									削除
+								</button>
 							</form>
 						</td>
 					</tr>
@@ -107,11 +131,10 @@
 							該当する図書がありません
 						</td>
 					</tr>
+					
 				</tbody>
 			</table>
 
-
-
 	</div>
 </body>
 

From d452eae3848b3c3a82889a235c2e46de40e1ec3c Mon Sep 17 00:00:00 2001
From: s-tajihi <2026_04_00508@it-college.co.jp>
Date: Mon, 28 Sep 2026 13:02:45 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[edit]=20=E5=9B=B3=E6=9B=B8=E4=B8=80?=
 =?UTF-8?q?=E8=A6=A7=E7=94=BB=E9=9D=A2=EF=BC=88=E4=B8=80=E8=88=AC=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=EF=BC=89=E3=81=AE=E8=A1=A8=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=AD=A3=E3=82=92=E8=A1=8C=E3=81=84=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book.html | 27 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html
index 9598a48..38231ea 100644
--- a/src/main/resources/templates/book.html
+++ b/src/main/resources/templates/book.html
@@ -68,10 +68,10 @@
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>本の状態</th>
-						<th>登録日時</th>
-						<th>更新日時</th>
-						<th>寄贈者</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
 						<th>貸出状態</th>
 						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
@@ -89,21 +89,23 @@
 						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
 						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
 						<td th:text="*{book.storageLocation.locationName}"></td>
-						<td th:text="*{book.condition == 0 ? '分からない':
+						<td th:if="${session.loginEmployee.adminFlag == 1}"
+							 th:text="*{book.condition == 0 ? '分からない':
 									   book.condition == 1 ? '新品':
 									   book.condition == 2 ? '良好':
 									   book.condition == 3 ? '使用感あり':
 									   book.condition == 4 ? '痛みあり':
 								       '不明'}">
 						</td>
-						<td th:text="*{book.createdAt}"></td>
-						<td th:text="*{book.updatedAt}"></td>
-						<td th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
-						<td
-							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
-						</td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" 
+							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? 
+							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
 						
 						<td th:if="${session.loginEmployee.adminFlag == 1}">
+							
 							<form method="post" action="/bookLend">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit"
@@ -111,18 +113,21 @@
 									貸出
 								</button>
 							</form>
+							
 							<form method="post" action="/updateconfirm">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit">
 									更新
 								</button>
 							</form>
+							
 							<form method="get" action="/delete">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit">
 									削除
 								</button>
 							</form>
+							
 						</td>
 					</tr>