diff --git a/src/main/java/com/web/controller/BoardController.java b/src/main/java/com/web/controller/BoardController.java
index 63c4f58..a662e4a 100644
--- a/src/main/java/com/web/controller/BoardController.java
+++ b/src/main/java/com/web/controller/BoardController.java
@@ -26,7 +26,7 @@ public BoardController(BoardService boardService) {
 
     @GetMapping({"", "/"})
     public String board(@RequestParam(value = "idx", defaultValue = "0") Long idx, Model model) {
-        model.addAttribute("board", boardService.findBoardByIdx(idx));
+        model.addAttribute("board", boardService.findBoardByIdx(idx).orElse(null));
         return "/board/form";
     }
 
diff --git a/src/main/java/com/web/domain/Board.java b/src/main/java/com/web/domain/Board.java
index f5078b1..ff9f08c 100644
--- a/src/main/java/com/web/domain/Board.java
+++ b/src/main/java/com/web/domain/Board.java
@@ -5,15 +5,7 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -30,7 +22,7 @@ public class Board implements Serializable {
 
     @Id
     @Column
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idx;
 
     @Column
diff --git a/src/main/java/com/web/domain/User.java b/src/main/java/com/web/domain/User.java
index 8933985..3e41759 100644
--- a/src/main/java/com/web/domain/User.java
+++ b/src/main/java/com/web/domain/User.java
@@ -5,13 +5,7 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -28,7 +22,7 @@ public class User implements Serializable {
 
     @Id
     @Column
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idx;
 
     @Column
diff --git a/src/main/java/com/web/domain/enums/SocialType.java b/src/main/java/com/web/domain/enums/SocialType.java
index 1a99061..0c0795e 100644
--- a/src/main/java/com/web/domain/enums/SocialType.java
+++ b/src/main/java/com/web/domain/enums/SocialType.java
@@ -17,6 +17,6 @@ public enum SocialType {
     public String getValue() { return name; }
 
     public boolean isEquals(String authority) {
-        return this.name.equals(authority);
+        return this.getRoleType().equals(authority);
     }
 }
diff --git a/src/main/java/com/web/resolver/UserArgumentResolver.java b/src/main/java/com/web/resolver/UserArgumentResolver.java
index 7afab54..73c217d 100644
--- a/src/main/java/com/web/resolver/UserArgumentResolver.java
+++ b/src/main/java/com/web/resolver/UserArgumentResolver.java
@@ -70,9 +70,9 @@ private User getUser(User user, HttpSession session) {
     }
 
     private User convertUser(String authority, Map<String, Object> map) {
-        if(FACEBOOK.isEquals(authority)) return getModernUser(FACEBOOK, map);
-        else if(GOOGLE.isEquals(authority)) return getModernUser(GOOGLE, map);
-        else if(KAKAO.isEquals(authority)) return getKaKaoUser(map);
+        if(FACEBOOK.getValue().equals(authority)) return getModernUser(FACEBOOK, map);
+        else if(GOOGLE.getValue().equals(authority)) return getModernUser(GOOGLE, map);
+        else if(KAKAO.getValue().equals(authority)) return getKaKaoUser(map);
         return null;
     }
 
diff --git a/src/main/java/com/web/service/BoardService.java b/src/main/java/com/web/service/BoardService.java
index 34f5ffd..0a38353 100644
--- a/src/main/java/com/web/service/BoardService.java
+++ b/src/main/java/com/web/service/BoardService.java
@@ -8,6 +8,8 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 /**
  * Created by KimYJ on 2017-07-13.
  */
@@ -25,8 +27,8 @@ public Page<Board> findBoardList(Pageable pageable) {
         return boardRepository.findAll(pageable);
     }
 
-    public Board findBoardByIdx(Long idx) {
-        return boardRepository.getOne(idx);
+    public Optional<Board> findBoardByIdx(Long idx) {
+        return boardRepository.findById(idx);
     }
 
 }