From 1c8ff91cb89c463ad6c134f7e01b38f8a3f75ab9 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 7 Dec 2022 10:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=85=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/AuthorizationController.java | 5 +- .../rest/MobileAuthorizationController.java | 2 +- .../nl/sso/system/service/wql/SYS_MENU.wql | 71 ----------- .../java/org/nl/sso/system/wql/SYS_DEPT.wql | 114 ++++++++++++++++++ .../sso/system/{service => }/wql/SYS_DICT.wql | 0 .../sso/system/{service => }/wql/SYS_ROLE.wql | 0 .../java/org/nl/sso/system/wql/sys_dept.wql | 56 --------- 7 files changed, 118 insertions(+), 130 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_MENU.wql create mode 100644 lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DEPT.wql rename lms/nladmin-system/src/main/java/org/nl/sso/system/{service => }/wql/SYS_DICT.wql (100%) rename lms/nladmin-system/src/main/java/org/nl/sso/system/{service => }/wql/SYS_ROLE.wql (100%) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/sso/system/wql/sys_dept.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/AuthorizationController.java b/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/AuthorizationController.java index 7ab5ef4cb..60ebef471 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/AuthorizationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/AuthorizationController.java @@ -111,8 +111,9 @@ public class AuthorizationController { CurrentUser user = new CurrentUser(); user.setId(userInfo.getLong("user_id")); user.setUsername(userInfo.getString("username")); - user.setPermissions(Lists.newArrayList(userInfo.getString("person_name"))); - user.setUser(userService.findById(userInfo.getLong("user_id"))); user.setPermissions(permissionList); + user.setPreson_name(userInfo.getString("person_name")); + user.setUser(userService.findById(userInfo.getLong("user_id"))); + user.setPermissions(permissionList); // SaLoginModel 配置登录相关参数 StpUtil.login(userInfo.getLong("user_id"), new SaLoginModel() .setDevice("PC") // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/MobileAuthorizationController.java b/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/MobileAuthorizationController.java index 20b1fd9b4..1ecb1befd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/MobileAuthorizationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/security/rest/MobileAuthorizationController.java @@ -70,7 +70,7 @@ public class MobileAuthorizationController { CurrentUser user = new CurrentUser(); user.setId(userInfo.getLong("user_id")); user.setUsername(userInfo.getString("username")); - user.setPermissions(Lists.newArrayList(userInfo.getString("person_name"))); + user.setPreson_name(userInfo.getString("person_name")); user.setUser(userService.findById(userInfo.getLong("user_id"))); user.setPermissions(permissionList); diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_MENU.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_MENU.wql deleted file mode 100644 index 3c2758ebd..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_MENU.wql +++ /dev/null @@ -1,71 +0,0 @@ -[交易说明] - 交易名： 获取用户权限 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.user_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - IF 输入.flag = "1" - QUERY - SELECT DISTINCT - permission - FROM - sys_menu - WHERE - menu_id IN - ( - SELECT - menu_id - FROM - sys_roles_menus - WHERE - role_id IN - ( - SELECT - role_id - FROM - sys_users_roles - WHERE - 1=1 - OPTION 输入.user_id <> "" - user_id = 输入.user_id - ENDOPTION - ) - ) - AND permission IS NOT NULL - AND permission != '' - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DEPT.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DEPT.wql new file mode 100644 index 000000000..ded476605 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DEPT.wql @@ -0,0 +1,114 @@ +[交易说明] + 交易名： 部门模块 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.name TYPEAS s_string + 输入.code TYPEAS s_string + 输入.pid TYPEAS s_string + 输入.pidIsNull TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.startTime TYPEAS s_string + 输入.endTime TYPEAS s_string + + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + * + FROM + sys_dept + WHERE 1=1 + OPTION 输入.pid <> "" + pid = 输入.pid + ENDOPTION + OPTION 输入.name <> "" + name = 输入.name + ENDOPTION + OPTION 输入.code <> "" + code = 输入.code + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + OPTION 输入.pidIsNull <> "" + pid is null + ENDOPTION + OPTION 输入.startTime <> "" + sys_user.create_time >= 输入.startTime + ENDOPTION + OPTION 输入.endTime <> "" + sys_user.create_time <= 输入.endTime + ENDOPTION + order by dept_sort asc + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + max(t3.childId) + from + ( + select *, + if( find_in_set(t1.pid, @p) > 0,@p := concat(@p,',',id),0 ) as childId + from + (select dept_id as id, pid from sys_dept t order by id) t1, + (select @p := '输入.pid') t2 + ) t3 + where childId != '0' + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + max(t3.childId) + from + ( + select *, + if( find_in_set(t1.pid, @p) > 0,@p := concat(@p,',',id),0 ) as childId + from + (select dept_id as id, pid from sys_dept t order by id) t1, + (select @p := '输入.pid') t2 + ) t3 + where childId != '0' + ENDSELECT + ENDPAGEQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_DICT.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_DICT.wql rename to lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_ROLE.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_ROLE.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/sso/system/service/wql/SYS_ROLE.wql rename to lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_ROLE.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/sys_dept.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/sys_dept.wql deleted file mode 100644 index 06d93886c..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/sys_dept.wql +++ /dev/null @@ -1,56 +0,0 @@ -[交易说明] - 交易名： 部门数据 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.grid_name TYPEAS s_string - - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - IF 输入.flag = "1" - PAGEQUERY - SELECT - sys_grid_field.*, sys_grid.name as grid_name - FROM - sys_grid_field - LEFT JOIN sys_grid ON sys_grid_field.grid_id = sys_grid.id - WHERE - sys_grid_field.is_delete = '0' AND sys_grid.is_delete = '0' - OPTION 输入.grid_name <> "" - sys_grid.name LIKE 输入.grid_name - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF