From 7f4f611b376db5668301a1198a3fcd3cf40b2c88 Mon Sep 17 00:00:00 2001 From: lichee Date: Fri, 16 Mar 2018 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?#IID51=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E5=85=A8=E4=B8=BA=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-console/src/main/resources/sql/console/menu.md | 2 +- admin-console/src/main/resources/sql/console/role.md | 6 +++--- .../src/main/resources/sql/console/roleFunction.md | 6 +++--- admin-console/src/main/resources/sql/console/user.md | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/admin-console/src/main/resources/sql/console/menu.md b/admin-console/src/main/resources/sql/console/menu.md index e96782cb..0ffb1a1f 100644 --- a/admin-console/src/main/resources/sql/console/menu.md +++ b/admin-console/src/main/resources/sql/console/menu.md @@ -8,7 +8,7 @@ queryByCondtion m.*,f.NAME function_name,f.ACCESS_URL , p.name parent_menu_name @} - from core_menu m left join core_function f on m.FUNCTION_ID=f.id left join core_MENU p on m.parent_menu_id = p.id + from core_menu m left join core_function f on m.FUNCTION_ID=f.id left join core_menu p on m.parent_menu_id = p.id where 1=1 @if(!isEmpty(url)){ and f.access_url like #'%'+url+"%"# diff --git a/admin-console/src/main/resources/sql/console/role.md b/admin-console/src/main/resources/sql/console/role.md index fbbc2bdf..64784108 100644 --- a/admin-console/src/main/resources/sql/console/role.md +++ b/admin-console/src/main/resources/sql/console/role.md @@ -5,7 +5,7 @@ queryByCondtion @pageTag(){ r.* @} - from core_ROLE r where 1=1 + from core_role r where 1=1 @if(!isEmpty(code)){ and r.code like #"%"+code+"%"# @} @@ -49,7 +49,7 @@ batchDelByIds * 批量删除角色，同时也参考batchDeleteRoleFunction，batchDeleteRoleMenu等方法删除其他关联数据 - delete from core_ROLE where id in( #join(ids)#); + delete from core_role where id in( #join(ids)#); batchDeleteRoleFunction === @@ -66,4 +66,4 @@ batchDeleteUserRole queryAllByDelflag ================= - select * from core_ROLE r where r.del_flag = #delFlag# + select * from core_role r where r.del_flag = #delFlag# diff --git a/admin-console/src/main/resources/sql/console/roleFunction.md b/admin-console/src/main/resources/sql/console/roleFunction.md index 31afa6c1..c70b89b7 100644 --- a/admin-console/src/main/resources/sql/console/roleFunction.md +++ b/admin-console/src/main/resources/sql/console/roleFunction.md @@ -3,13 +3,13 @@ deleteRoleFunction * 删除所有的功能的角色配置 - delete from core_ROLE_FUNCTION where function_id in ( #join(ids)# ) + delete from core_role_function where function_id in ( #join(ids)# ) getFunctionIdByRole === * 获得角色对应的功能id - select function_id from core_ROLE_FUNCTION where role_id=#roleId# + select function_id from core_role_function where role_id=#roleId# getQueryFunctionAndRoleData @@ -17,4 +17,4 @@ getQueryFunctionAndRoleData * 获得所有查询功能，并查询角色对应的功能信息。 - select f.*,r.data_access_type from core_ROLE_FUNCTION r left join core_FUNCTION f on r.function_id=f.id where r.role_id=#roleId# and f.type='FN1' \ No newline at end of file + select f.*,r.data_access_type from core_role_function r left join core_function f on r.function_id=f.id where r.role_id=#roleId# and f.type='FN1' \ No newline at end of file diff --git a/admin-console/src/main/resources/sql/console/user.md b/admin-console/src/main/resources/sql/console/user.md index 112586bd..8137df51 100644 --- a/admin-console/src/main/resources/sql/console/user.md +++ b/admin-console/src/main/resources/sql/console/user.md @@ -6,7 +6,7 @@ queryByCondtion @pageTag(){ u.*,o.name org_name @} - from core_USER u left join core_ORG o on u.org_id=o.id where 1=1 and u.del_flag = 0 + from core_user u left join core_org o on u.org_id=o.id where 1=1 and u.del_flag = 0 @//数据权限，该sql语句功能点 and #function("user.query")# @if(!isEmpty(orgId)){ @@ -41,11 +41,11 @@ queryByCondtion batchDelUserByIds === - update core_USER u set u.del_flag = 1 where u.id in( #join(ids)#) + update core_user u set u.del_flag = 1 where u.id in( #join(ids)#) batchUpdateUserState === - update core_USER u set u.state = #state# where u.id in( #join(ids)#) + update core_user u set u.state = #state# where u.id in( #join(ids)#) queryUserRole === @@ -56,8 +56,8 @@ queryUserRole ur.*, u.code as user_code, u.name as user_name, org.name as org_name, role.name as role_name - from core_USER_ROLE ur - left join core_ORG org on org.id = ur.org_id + from core_user_role ur + left join core_org org on org.id = ur.org_id left join core_user u on u.id = ur.user_id left join core_role role on role.id = ur.role_id where u.id=#id# -- Gitee