From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:55:10 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 2 --
src/main/resources/migration/V1_10__Alter_Table.sql | 5 +----
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/migration/V1_10__Alter_Table.sql b/src/main/resources/migration/V1_10__Alter_Table.sql
index 95e9573..146e53a 100644
--- a/src/main/resources/migration/V1_10__Alter_Table.sql
+++ b/src/main/resources/migration/V1_10__Alter_Table.sql
@@ -24,7 +24,4 @@
`default_yn` VARCHAR (1) NOT NULL DEFAULT 'N',
`basic_user` VARCHAR (1) NOT NULL DEFAULT 'N',
PRIMARY KEY (`id`) USING btree
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-ALTER TABLE `user_workspace` ADD COLUMN `level_name` VARCHAR(50) NOT NULL;
-ALTER TABLE `user_workspace` ADD COLUMN `department_name` VARCHAR(50) NOT NULL;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
\ No newline at end of file
diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index cde0860..0b89246 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -9,8 +9,6 @@
u.id as userId,
u.name as userName,
u.account as account,
- u.levelName as levelName,
- u.departmentName as departmentName,
/*u.permission as permission,*/
CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
FROM
--
Gitblit v1.8.0