- 이슈 엑셀 임포트 시 부서 추가 코드 수정

이민희

2022-03-03 2b0d6901597206d1c24abad0ff3ac0889f9194dd

 src/main/java/kr/wisestone/owl/domain/Department.java

@@ -3,6 +3,7 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

@Entity
@@ -17,7 +18,7 @@
    private String departmentDescription;

    @OneToMany(mappedBy = "department", cascade = {CascadeType.ALL}, orphanRemoval = true)
    private Set<ProjectRoleUser> projectRoleDepartments = new HashSet<>();
    private Set<ProjectRoleDepartment> projectRoleDepartments = new HashSet<ProjectRoleDepartment>();

    public Department() {
    }
@@ -46,12 +47,24 @@
        this.departmentDescription = departmentDescription;
    }

    /*public void addProjectRole(ProjectRole projectRole) {
    public void addProjectRole(ProjectRole projectRole) {
        if (this.projectRoleDepartments == null) {
            this.projectRoleDepartments = new HashSet<>();
        }
        ProjectRoleUser projectRoleUser = new ProjectRoleUser(projectRole, this);
        ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(projectRole, this);

        this.projectRoleDepartments.add(projectRoleUser);
    }*/
        this.projectRoleDepartments.add(projectRoleDepartment);
    }

    public void removeProjectRole(ProjectRole projectRole) {
        Iterator<ProjectRoleDepartment> iterator = this.projectRoleDepartments.iterator();

        while (iterator.hasNext()) {
            ProjectRoleDepartment projectRoleDepartment = iterator.next();
            if (projectRole.getId().equals(projectRoleDepartment.getProjectRole().getId())) {
                this.projectRoleDepartments.remove(projectRoleDepartment);
                break;
            }
        }
    }
}