2日目 コミットしてなかった分

This commit is contained in:
2026-09-16 14:56:47 +09:00
parent cbbfae71fb
commit bd691238e7
2 changed files with 29 additions and 25 deletions

View File

@@ -10,7 +10,6 @@ public class EmployeeData {
static final String COMPANY_NAME = "Rhizome"; static final String COMPANY_NAME = "Rhizome";
@Override @Override
public String toString() { public String toString() {
return getIdEmployee() + "\t" + getNmEmployee() + " " + getKnEmployee() + "\t" + getMailAddress() return getIdEmployee() + "\t" + getNmEmployee() + " " + getKnEmployee() + "\t" + getMailAddress()
@@ -31,15 +30,20 @@ public class EmployeeData {
public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password, public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
String idDepartment) { String idDepartment) {
nmEmployee=nmEmployee.strip(); nmEmployee = nmEmployee.strip();
int nmNum = nmEmployee.length(); int nmNum = nmEmployee.length();
if(nmNum==0) { idEmployee = idEmployee.strip();
int idNum = idEmployee.length();
if (nmNum == 0) {
System.out.println("社員名が空のため設定できませんでした"); System.out.println("社員名が空のため設定できませんでした");
} }
if(nmNum>0){ if (idNum == 0) {
System.out.println("社員IDが空のため設定できませんでした");
}
if (nmNum > 0 && idNum > 0) {
this.setIdEmployee(idEmployee); this.setIdEmployee(idEmployee);
this.setNmEmployee(nmEmployee); this.setNmEmployee(nmEmployee);
@@ -48,6 +52,7 @@ public class EmployeeData {
this.setPassword(password); this.setPassword(password);
this.setIdDepartment(idDepartment); this.setIdDepartment(idDepartment);
empCount++; empCount++;
} }
} }
@@ -100,8 +105,4 @@ public class EmployeeData {
this.idDepartment = idDepartment; this.idDepartment = idDepartment;
} }
} }

View File

@@ -2,7 +2,7 @@
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
EmployeeData[] employee = new EmployeeData[5]; EmployeeData[] employee = new EmployeeData[5];
employee[0] = new EmployeeData("10000"," ","ヤマダタツヤ","yamada@hoge.jp","aaa","10"); employee[0] = new EmployeeData("10000","","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
employee[1] = new EmployeeData(); employee[1] = new EmployeeData();
employee[2] = new EmployeeData(); employee[2] = new EmployeeData();
employee[3] = new EmployeeData(); employee[3] = new EmployeeData();
@@ -48,6 +48,9 @@ public class Main {
for(int i=0;i<5;i++) { for(int i=0;i<5;i++) {
if(employee[i].getNmEmployee()==null) {
continue;
}
System.out.println(employee[i]); System.out.println(employee[i]);
} }