From 6f111a79db77890bc448cd46ea080d94039864cf Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 09 11월 2021 16:59:33 +0900
Subject: [PATCH] 백앤드 수정
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 6 +++---
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 11 -----------
src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 4 ++--
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 6 +++---
4 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
index ec8e228..0e44c92 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -139,9 +139,9 @@
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("遺��꽌 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("departmentManage.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("departmentManage.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("department.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("department.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("department.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(departmentVos);
diff --git a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
index 0b20ebf..b0add88 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
@@ -16,8 +16,8 @@
private Integer Page;
private Integer PageSize;
- public static DepartmentCondition make(Map<String, Object> departmentManageConditions) {
- return ConvertUtil.convertMapToClass(departmentManageConditions, DepartmentCondition.class);
+ public static DepartmentCondition make(Map<String, Object> departmentConditions) {
+ return ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
}
public Long getId() {
diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index ffaeea5..e62cbbc 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -10,7 +10,6 @@
u.name as userName,
u.account as account,
u.level_id as levelId,
- u.department_id as departmentId,
CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
FROM
user_workspace uw
@@ -44,16 +43,6 @@
</foreach>
</when>
</choose>
-
- <choose>
- <when test="departmentIds.size != 0">
- AND u.department_id IN
- <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
limit #{pageSize} offset #{page};
</select>
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index a97c38b..069a473 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -109,9 +109,9 @@
manageUser.manageFAQPerm=FAQ \uAD00\uB9AC
manageUser.manageQnAPerm=QnA \uAD00\uB9AC
manageUser.manageGuidePerm=\uAC00\uC774\uB4DC \uAD00\uB9AC
-departmentManage.departmentName=\uBD80\uC11C\uBA85
-departmentManage.departmentDescription=\uBD80\uC11C\uC124\uBA85
-departmentManage.departmentCount=\uBD80\uC11C\uC778\uC6D0
+department.departmentName=\uBD80\uC11C\uBA85
+department.departmentDescription=\uBD80\uC11C\uC124\uBA85
+department.departmentCount=\uBD80\uC11C\uC778\uC6D0
companyField.companyName=\uC5C5\uCCB4\uBA85
companyField.companyManager=\uB2F4\uB2F9\uC790
companyField.companyTel=\uC804\uD654\uBC88\uD638
--
Gitblit v1.8.0