From 578590c0540eee79ccf3af069db71efaf6bc2bfc Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 10 11월 2021 09:31:28 +0900
Subject: [PATCH] 사용자 관리 백앤드 수정
---
src/main/resources/mybatis/query-template/department-template.xml | 2 +-
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 1 +
src/main/resources/migration/V1_11__Alter_Table.sql | 3 ++-
src/main/java/kr/wisestone/owl/domain/User.java | 4 ++++
src/main/resources/migration/V1_10__Alter_Table.sql | 2 +-
src/main/java/kr/wisestone/owl/domain/UserDepartment.java | 5 ++---
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index d40a9f2..e17095c 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -63,6 +63,10 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
+// @ManyToOne(targetEntity = UserDepartment.class, fetch = FetchType.LAZY)
+// @JoinColumn(name="department_id")
+// private UserDepartment userDepartment;
+
public User() {
}
diff --git a/src/main/java/kr/wisestone/owl/domain/UserDepartment.java b/src/main/java/kr/wisestone/owl/domain/UserDepartment.java
index 7e6abb7..8c11eb3 100644
--- a/src/main/java/kr/wisestone/owl/domain/UserDepartment.java
+++ b/src/main/java/kr/wisestone/owl/domain/UserDepartment.java
@@ -1,10 +1,9 @@
package kr.wisestone.owl.domain;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
import java.io.Serializable;
+@Entity
public class UserDepartment extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 6d4c5a1..68fa9a5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -17,6 +17,7 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
+import kr.wisestone.owl.web.form.DepartmentForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
diff --git a/src/main/resources/migration/V1_10__Alter_Table.sql b/src/main/resources/migration/V1_10__Alter_Table.sql
index 91f187d..9cca17d 100644
--- a/src/main/resources/migration/V1_10__Alter_Table.sql
+++ b/src/main/resources/migration/V1_10__Alter_Table.sql
@@ -3,7 +3,7 @@
CREATE TABLE `department`(
`id` BIGINT(11) AUTO_INCREMENT,
- `department_name` VARCHAR(50) NULL,
+ `department_name` VARCHAR(50) NOT NULL,
`department_description` VARCHAR(255) NULL,
`register_id` BIGINT(20) NOT NULL,
`register_date` TIMESTAMP NULL,
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index f949049..9842a12 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -45,7 +45,8 @@
CREATE TABLE `user_department`(
`id` BIGINT(11) AUTO_INCREMENT,
- `department_id` VARCHAR(50) NOT NULL,
+ `department_id` VARCHAR(50) NULL,
+ `user_id` VARCHAR(50) NULL,
`register_id` BIGINT(20) NOT NULL,
`register_date` TIMESTAMP NULL,
`modify_id` BIGINT(20) NOT NULL,
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index 190106f..abb1f65 100644
--- a/src/main/resources/mybatis/query-template/department-template.xml
+++ b/src/main/resources/mybatis/query-template/department-template.xml
@@ -8,7 +8,7 @@
d.id as id,
d.department_name as departmentName,
d.department_description as departmentDescription,
- (SELECT COUNT(u.id) FROM user u WHERE d.id = u.department_id) AS departmentCount
+ (SELECT COUNT(d.id) FROM user_department ud WHERE d.id = ud.department_id) AS departmentCount
FROM
department d
WHERE 1=1
--
Gitblit v1.8.0