diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 2a281f3..4fcb604 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -5,43 +5,51 @@ public class Main {
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
 
-		Scanner scanner = new Scanner(System.in);
-		System.out.println("検索したい社員IDを入力してください");
-		String id = scanner.nextLine();
-		boolean bo = false;
+		while (true) {
 
-		EmployeeData[] employees = new EmployeeData[5];
+			System.out.println("検索したい社員IDを入力してください（終了したい場合は0）");
+			Scanner scanner = new Scanner(System.in);
+			String id = scanner.nextLine();
+			boolean bo = false;
 
-		EmployeeData employee = new EmployeeData("10001", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+			EmployeeData[] employees = new EmployeeData[5];
 
-		EmployeeData employee1 = new EmployeeData("10002", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+			EmployeeData employee = new EmployeeData("10001", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
 
-		EmployeeData employee2 = new EmployeeData("10003", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+			EmployeeData employee1 = new EmployeeData("10002", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
 
-		EmployeeData employee3 = new EmployeeData("10004", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+			EmployeeData employee2 = new EmployeeData("10003", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
 
-		EmployeeData employee4 = new EmployeeData("10005", "三宅武", "ミヤケタケシ", "miya@hoge.jp,eee", "eee", "13");
+			EmployeeData employee3 = new EmployeeData("10004", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
 
-		employees[0] = employee;
-		employees[1] = employee1;
-		employees[2] = employee2;
-		employees[3] = employee3;
-		employees[4] = employee4;
+			EmployeeData employee4 = new EmployeeData("10005", "三宅武", "ミヤケタケシ", "miya@hoge.jp,eee", "eee", "13");
 
-		for (int i = 0; i < employees.length; i++) {
+			employees[0] = employee;
+			employees[1] = employee1;
+			employees[2] = employee2;
+			employees[3] = employee3;
+			employees[4] = employee4;
 
-			//			System.out.println(employees[i]);
-			if (employees[i].isMatchId(id) == true) {
-				bo = true;
-				System.out.println(employees[i]);
+			for (int i = 0; i < employees.length; i++) {
+
+				//			System.out.println(employees[i]);
+				if (employees[i].isMatchId(id) == true) {
+					bo = true;
+					System.out.println(employees[i]);
+				}
+
+				//			employees[i].isMatchId("10002");
+				//			employees[i].isMatchId("99999");
+				continue;
+			}
+			if (bo == false && !id.equals("0")) {
+				System.out.println("該当する社員が見つかりませんでした");
+			}
+			if (id.equals("0")) {
+				System.out.println("システムを終了します");
+				break;
 			}
 
-			//			employees[i].isMatchId("10002");
-			//			employees[i].isMatchId("99999");
-			continue;
-		}
-		if (bo == false) {
-			System.out.println("該当する社員が見つかりませんでした");
 		}
 
 	}