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 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 1a02ff4..38231ea 100644 --- a/src/main/resources/templates/book.html +++ b/src/main/resources/templates/book.html @@ -8,9 +8,33 @@ + +
+ +
+ ShareBooks +
+ +
+ + + + () + + + + ログアウト + + +
+ +
+

社内図書一覧

+
@@ -22,19 +46,16 @@
- +
- +

※「タイトル」「出版社」「著者名」で検索

- -
- @@ -47,12 +68,12 @@ - - - - + + + + - + @@ -68,20 +89,23 @@ - - - - - - + + + + + - + +
カテゴリー名 サブカテゴリー名 保管場所本の状態登録日時更新日時寄贈者本の状態登録日時更新日時寄贈者 貸出状態操作操作
- + + + +
- +
+
該当する図書がありません
- - - +
\ No newline at end of file