diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index 318f611..bb63193 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -21,6 +21,11 @@ public class EmployeeData {
 
 	//idEmployee「ID」を設定するsetter
 	public void setIdEmployee(String idEmployee) {
+		if(idEmployee == null || idEmployee.trim().isEmpty()) {
+			System.out.println("社員IDが空のため設定できませんでした");
+			return;
+		}
+		
 		this.idEmployee = idEmployee;
 	}
 
@@ -31,7 +36,7 @@ public class EmployeeData {
 
 	//nmEmployee「名前」を設定するsetter
 	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee.trim();
+//		this.nmEmployee = nmEmployee.trim();
 		
 		if (nmEmployee == null || nmEmployee.trim().isEmpty()) {
 			System.out.println("社員名が空のため設定できませんでした");
@@ -39,10 +44,6 @@ public class EmployeeData {
 		}
 		
 		this.nmEmployee = nmEmployee;
-		//		this.nmEmployee = nmEmployee.trim(); //前後の空白削除
-		//		this.nmEmployee = null;	
-		//		if(nmEmployee != null && nmEmployee.isEmpty()) {
-		//			System.out.println("社員名が空のため設定できませんでした");
 	}
 
 	//getKnEmployee「カタカナの名前」を取得するgetter
@@ -93,12 +94,18 @@ public class EmployeeData {
 
 	public EmployeeData(String idEmployee, String nmEmployee,
 			String knEmployee, String mailAddress, String password, String idDepartment) {
-		this.idEmployee = idEmployee;
-		this.nmEmployee = nmEmployee;
-		this.knEmployee = knEmployee;
-		this.mailAddress = mailAddress;
-		this.password = password;
-		this.idDepartment = idDepartment;
+		this.setIdEmployee(idEmployee);  //2d 段階9
+//		this.idEmployee = idEmployee;
+		this.setNmEmployee(nmEmployee);
+//		this.nmEmployee = nmEmployee;
+		this.setKnEmployee(knEmployee);
+//		this.knEmployee = knEmployee;
+		this.setMailAddress(mailAddress);
+//		this.mailAddress = mailAddress;
+		this.setPassword(password);
+//		this.password = password;
+		this.setIdEmployee(idEmployee);
+//		this.idDepartment = idDepartment;
 		empCount++;
 	}
 
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 88fb53d..ec48236 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -14,13 +14,13 @@ public class Main {
 
 //		employees[0] = new EmployeeData();
 
-		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		//		employees[0].setIdEmployee("1000");                        //private　後　に使用する！！
-				employees[0].setNmEmployee("");  //段階　8　確認用
-		//		employees[0].setKnEmployee("ヤマダタツヤ");
-		//		employees[0].setMailAddress("yamada@hoge.jp");
-		//		employees[0].setPassword("aaa");
-		//		employees[0].setIdDepartment("10");
+		employees[0] = new EmployeeData("", "", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+//				employees[0].setIdEmployee("");                        //private　後　に使用する！！
+//				employees[0].setNmEmployee("");  //段階　8　確認用
+//				employees[0].setKnEmployee("ヤマダタツヤ");
+//				employees[0].setMailAddress("yamada@hoge.jp");
+//				employees[0].setPassword("aaa");
+//				employees[0].setIdDepartment("10");
 
 		//		employees[0].idEmployee = "1000"; //段階5の分に　s[0]　足した   //privete　前　に使用！！！！！！
 		//		employees[0].nmEmployee = "山田龍也";
@@ -83,7 +83,7 @@ public class Main {
 		//		employees[3].idDepartment = "12";
 		//		//			
 //		employees[4] = new EmployeeData();
-		employees[4] = new EmployeeData("10004", "aa", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		employees[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
 
 		//		employees[4].setIdEmployee("10004");
 		//		employees[4].setNmEmployee("三宅武");