From 64bd81c71706981e812231aced95f505babd1558 Mon Sep 17 00:00:00 2001
From: m-shimizu <26-m-e-stella-tecnica@it-college.jp>
Date: Thu, 24 Sep 2026 09:59:31 +0900
Subject: [PATCH] =?UTF-8?q?Day2=5F8=E6=AE=B5=E9=9A=8E=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/EmployeeData.java | 20 ++++++++++++++++++--
 em-oop/src/Main.java         |  6 +++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index f84ef12..3b28491 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -1,6 +1,6 @@
 
 public class EmployeeData {
-
+	
 	private String idEmployee;
 	private String nmEmployee;
 	private String knEmployee;
@@ -8,9 +8,11 @@ public class EmployeeData {
 	private String password;
 	private String idDepartment;
 
+	private static int empCount = 0;
+	
 	//引数なしコンストラクタ
 	public EmployeeData() {
-
+		empCount++;
 	}
 
 	//6つの引数をもつコンストラクタ
@@ -29,8 +31,14 @@ public class EmployeeData {
 		this.setPassword(password);
 		this.setIdDepartment(idDepartment);
 
+		empCount++;
+		
 	}
 
+	public static int getEmpCount() {
+		return empCount;
+	}
+	
 	public String getIdEmployee() {
 		return idEmployee;
 	}
@@ -44,6 +52,14 @@ public class EmployeeData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
+		
+		//8段階目（空文字や空白だけの値が渡された場合は代入しない）
+		if (nmEmployee == null || nmEmployee.trim().isEmpty()) {
+			System.out.println("社員名が空のため設定できませんでした");
+			return;
+		
+		}
+			
 		this.nmEmployee = nmEmployee;
 	}
 
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 01fceed..fbc28e3 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -14,7 +14,7 @@ public class Main {
 		Employees[4] = new EmployeeData();
 		
 		Employees[0].setIdEmployee("10000");
-		Employees[0].setNmEmployee("山田龍也");
+		Employees[0].setNmEmployee("");
 		Employees[0].setKnEmployee("ヤマダタツヤ");
 		Employees[0].setMailAddress("yamada@hoge.jp");
 		Employees[0].setPassword("aaa");
@@ -56,6 +56,8 @@ public class Main {
 		System.out.println(Employees[i]);
 		
 	}
+		
+		System.out.println("現在の社員データ件数:" + EmployeeData.getEmpCount() + "件");
 	
 		Scanner scanner = new Scanner(System.in);
 		
@@ -76,6 +78,8 @@ public class Main {
 				System.out.println(Employees[i]);
 				found = true;
 			}
+		
+			
 				
 		}