From 9c17ea26bb894c1969ed1dd12bd538ebba7d244e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 10 11월 2021 12:42:29 +0900
Subject: [PATCH] 사용자 관리 백앤드 수정
---
src/main/resources/mybatis/query-template/department-template.xml | 2 +-
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 16 ++++++++++------
src/main/java/kr/wisestone/owl/domain/User.java | 4 ++--
src/main/java/kr/wisestone/owl/domain/UserDepartment.java | 12 ++++++++++++
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js | 10 +++++-----
5 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index e17095c..679b680 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -63,9 +63,9 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
-// @ManyToOne(targetEntity = UserDepartment.class, fetch = FetchType.LAZY)
+// @ManyToOne(targetEntity = Department.class, fetch = FetchType.LAZY)
// @JoinColumn(name="department_id")
-// private UserDepartment userDepartment;
+// private Department department;
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 8c11eb3..c159c18 100644
--- a/src/main/java/kr/wisestone/owl/domain/UserDepartment.java
+++ b/src/main/java/kr/wisestone/owl/domain/UserDepartment.java
@@ -12,6 +12,10 @@
private Long id;
private String departmentId;
+ @ManyToOne(targetEntity = User.class, fetch = FetchType.LAZY)
+ @JoinColumn(name="user_id")
+ private User user;
+
public UserDepartment(){}
public Long getId() {
@@ -29,4 +33,12 @@
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
}
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 68fa9a5..36b2936 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -12,6 +12,7 @@
import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserMapper;
+import kr.wisestone.owl.repository.DepartmentRepository;
import kr.wisestone.owl.repository.UserRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.*;
@@ -54,6 +55,9 @@
@Autowired
private UserRepository userRepository;
+
+ @Autowired
+ private DepartmentRepository departmentRepository;
@Autowired
private UserLevelService userLevelService;
@@ -259,13 +263,13 @@
/*user.setPermission(MngPermission.makeSubAllPermission());*/
}
}
+ DepartmentForm departmentForm = new DepartmentForm();
-// DepartmentManageForm departmentManageForm = new DepartmentManageForm();
-//
-// departmentManageForm.setDepartmentName("遺��꽌 �뾾�쓬");
-// DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
-// user.setDepartmentManage(departmentManage);
+ departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
+ Department department = this.departmentService.add(departmentForm);
+ // wyu
+ this.departmentRepository.saveAndFlush(department);
this.userRepository.saveAndFlush(user);
// �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
@@ -1195,7 +1199,7 @@
@Transactional(readOnly = true)
public User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest) {
User user = this.getUser(this.webAppUtil.getLoginId());
- UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission"); // wyu - ignores permission ??
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index abb1f65..fa372ac 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(d.id) FROM user_department ud WHERE d.id = ud.department_id) AS departmentCount
+ (SELECT COUNT(d.id) FROM user u WHERE d.id = u.id) AS departmentCount
FROM
department d
WHERE 1=1
diff --git a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
index f3c8d06..4e876c0 100644
--- a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
+++ b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -34,31 +34,31 @@
//遺��꽌 愿�由�
departmentFind : function (conditions) {
- return $http.post("departmentManage/find", conditions).then(function (response) {
+ return $http.post("department/find", conditions).then(function (response) {
$log.debug("遺��꽌 紐⑸줉 : ", response);
return response;
});
},
departmentDetail : function (conditions) {
- return $http.post("departmentManage/detail", conditions).then(function (response) {
+ return $http.post("department/detail", conditions).then(function (response) {
$log.debug("遺��꽌 �긽�꽭 : ", response);
return response;
});
},
departmentAdd : function (conditions) {
- return $http.post("departmentManage/add", conditions).then(function (response) {
+ return $http.post("department/add", conditions).then(function (response) {
$log.debug("遺��꽌 �깮�꽦 寃곌낵 : ", response);
return response;
});
},
departmentModify : function (conditions) {
- return $http.post("departmentManage/modify", conditions).then(function (response) {
+ return $http.post("department/modify", conditions).then(function (response) {
$log.debug("遺��꽌 �닔�젙 寃곌낵 : ", response);
return response;
});
},
departmentRemove : function (conditions) {
- return $http.post("departmentManage/remove", conditions).then(function (response) {
+ return $http.post("department/remove", conditions).then(function (response) {
$log.debug("遺��꽌 �궘�젣 寃곌낵 : ", response);
return response;
});
--
Gitblit v1.8.0