浏览代码

update role

zisokal 3 年之前
父节点
当前提交
9b559442ea
共有 4 个文件被更改,包括 77 次插入60 次删除
  1. 42 42
      app/routes/dicttype.py
  2. 9 12
      app/routes/role.py
  3. 24 4
      db.sql
  4. 2 2
      ui/src/router/index.js

+ 42 - 42
app/routes/dicttype.py

@@ -1,42 +1,42 @@
-from ..base import base
-from ..models import DictData, DictType
-from flask import render_template, request, jsonify
-from sqlalchemy import asc
-from sqlalchemy import desc
-
-@base.route('/system/dict/type/list', methods=['GET'])
-def sysdict_type_list():
-    filters = []
-    if 'dictName' in request.args:
-        filters.append(DictType.dict_name.like('%' + request.args['dictName'] + '%'))
-    if 'dictType' in request.args:
-        filters.append(DictType.dict_type.like('%' + request.args['dictType'] + '%'))
-
-    if 'status' in request.args:
-        filters.append(DictType.status == request.args['status'])
-
-
-    if 'params[beginTime]' in request.args and 'params[endTime]' in request.args:
-        filters.append(DictType.create_time >  request.args['params[beginTime]'])
-        filters.append(DictType.create_time <  request.args['params[endTime]'])
-
-    page = request.args.get('pageNum', 1, type=int)
-    rows = request.args.get('pageSize', 10, type=int)
-    pagination = DictType.query.filter(*filters).paginate(
-        page, per_page=rows, error_out=False)
-    types = pagination.items
-
-    return jsonify({'msg': '操作成功', 'code': 200, 'rows': [type.to_json() for type in types], 'total': len(types)})
-
-@base.route('/system/dict/type/<id>', methods=['GET'])
-def sysdict_type_get_by_id(id):
-    type = DictData.query.get(id)
-
-    return jsonify({'msg': '操作成功', 'code': 200, 'data': type.to_json()})
-
-@base.route('/system/dict/type/optionselect', methods=['GET'])
-def sysdict_type_all():
-    types = DictData.query.all()
-
-    return jsonify({'msg': '操作成功', 'code': 200, 'data': [type.to_json() for type in types]})   
-
+from ..base import base
+from ..models import DictData, DictType
+from flask import render_template, request, jsonify
+from sqlalchemy import asc
+from sqlalchemy import desc
+
+@base.route('/system/dict/type/list', methods=['GET'])
+def sysdict_type_list():
+    filters = []
+    if 'dictName' in request.args:
+        filters.append(DictType.dict_name.like('%' + request.args['dictName'] + '%'))
+    if 'dictType' in request.args:
+        filters.append(DictType.dict_type.like('%' + request.args['dictType'] + '%'))
+
+    if 'status' in request.args:
+        filters.append(DictType.status == request.args['status'])
+
+
+    if 'params[beginTime]' in request.args and 'params[endTime]' in request.args:
+        filters.append(DictType.create_time >  request.args['params[beginTime]'])
+        filters.append(DictType.create_time <  request.args['params[endTime]'])
+
+    page = request.args.get('pageNum', 1, type=int)
+    rows = request.args.get('pageSize', 10, type=int)
+    pagination = DictType.query.filter(*filters).paginate(
+        page, per_page=rows, error_out=False)
+    types = pagination.items
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'rows': [type.to_json() for type in types], 'total': len(types)})
+
+@base.route('/system/dict/type/<id>', methods=['GET'])
+def sysdict_type_get_by_id(id):
+    type = DictData.query.get(id)
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'data': type.to_json()})
+
+@base.route('/system/dict/type/optionselect', methods=['GET'])
+def sysdict_type_all():
+    types = DictData.query.all()
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'data': [type.to_json() for type in types]})   
+

+ 9 - 12
app/routes/role.py

@@ -37,22 +37,19 @@ def get_roles_by_userId():
     return jsonify([role.to_json() for role in roles])
     return jsonify([role.to_json() for role in roles])
 
 
 
 
-@base.route('/base/syrole!grant.action', methods=['POST'])
+@base.route('/system/role/authUser/cancelAll', methods=['PUT'])
 def grant_role():
 def grant_role():
-    id = request.form.get('id')
-    ids = request.form.get('ids')
+    roleId = request.args.get('roleId')
+    userIds = request.args.get('userIds')
 
 
-    role = Role.query.get(id)
-
-    if not ids: #授权资源为空
-        role.resources = []
-    else:       #授权资源访问,资源之间以逗号分割
-        idList = ids.split(',')
-        role.resources = [Resource.query.get(rid) for rid in idList]
+    role = Role.query.get(roleId)
+    idList = userIds.split(',')
+    toCancelUsers = [User.query.get(uid) for uid in idList]
+    role.users = [user2  for user2 in role.users.all() for user in toCancelUsers if user2.ID != user.ID ]
 
 
     db.session.add(role)
     db.session.add(role)
 
 
-    return jsonify({'success': True})
+    return jsonify({'code': 200, 'msg': '取消成功'})
 
 
 @base.route('/system/role/list', methods=['GET'])
 @base.route('/system/role/list', methods=['GET'])
 def grid():
 def grid():
@@ -145,4 +142,4 @@ def unallocatedList():
         page, per_page=rows, error_out=False)
         page, per_page=rows, error_out=False)
     users = pagination.items
     users = pagination.items
 
 
-    return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total})
+    return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total})

+ 24 - 4
db.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  Target Server Version : 80029
  File Encoding         : 65001
  File Encoding         : 65001
 
 
- Date: 28/05/2022 13:16:59
+ Date: 30/05/2022 08:10:30
 */
 */
 
 
 SET NAMES utf8mb4;
 SET NAMES utf8mb4;
@@ -49,6 +49,7 @@ INSERT INTO `SYONLINE` VALUES ('734aeec9-e371-4f2f-9046-9b2daefa2370', '2022-05-
 INSERT INTO `SYONLINE` VALUES ('76071a92-e2fb-4c45-8a71-f44a70d0dd8e', '2022-05-22 09:22:26', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76071a92-e2fb-4c45-8a71-f44a70d0dd8e', '2022-05-22 09:22:26', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76a3b3de-cb8c-4c03-a47a-ba61ee6296f1', '2022-05-28 11:59:41', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76a3b3de-cb8c-4c03-a47a-ba61ee6296f1', '2022-05-28 11:59:41', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76c7109c-af8c-4375-bb65-0f17cd2446dd', '2022-05-22 09:23:30', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('76c7109c-af8c-4375-bb65-0f17cd2446dd', '2022-05-22 09:23:30', '127.0.0.1', 'admin', '0');
+INSERT INTO `SYONLINE` VALUES ('7acf2f14-0594-4e15-8596-e4a5190a6228', '2022-05-29 22:57:36', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('80de6227-9a7e-45c5-a093-ca4950a8fc7d', '2022-05-22 09:40:38', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('80de6227-9a7e-45c5-a093-ca4950a8fc7d', '2022-05-22 09:40:38', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('8455c194-84aa-405b-b1d8-4ff6d2cb7d84', '2022-05-22 09:22:15', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('8455c194-84aa-405b-b1d8-4ff6d2cb7d84', '2022-05-22 09:22:15', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('8e13f90a-0875-4da7-863c-48dad3886415', '2022-05-22 09:23:20', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('8e13f90a-0875-4da7-863c-48dad3886415', '2022-05-22 09:23:20', '127.0.0.1', 'admin', '1');
@@ -63,6 +64,7 @@ INSERT INTO `SYONLINE` VALUES ('c409ede4-02b5-42e1-a56f-4c6ea5f38abe', '2022-05-
 INSERT INTO `SYONLINE` VALUES ('c741837f-da2a-4230-8b57-51914023dfa5', '2022-05-18 10:21:32', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('c741837f-da2a-4230-8b57-51914023dfa5', '2022-05-18 10:21:32', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('cdaebb6f-64a4-45a9-98b1-7f7a27c049a7', '2022-05-22 09:40:51', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('cdaebb6f-64a4-45a9-98b1-7f7a27c049a7', '2022-05-22 09:40:51', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('d1c21a0b-2387-48a5-98dc-9f7f59de5049', '2022-05-22 09:22:26', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('d1c21a0b-2387-48a5-98dc-9f7f59de5049', '2022-05-22 09:22:26', '127.0.0.1', 'admin', '0');
+INSERT INTO `SYONLINE` VALUES ('da041fd0-f6fc-4211-8cf9-5b3de65dd678', '2022-05-28 20:58:08', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('de70466a-4441-4488-aa05-6b412782a562', '2022-05-22 09:39:46', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('de70466a-4441-4488-aa05-6b412782a562', '2022-05-22 09:39:46', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('e5459bbe-aead-420f-a13b-b11e7a41d022', '2022-05-22 09:30:52', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('e5459bbe-aead-420f-a13b-b11e7a41d022', '2022-05-22 09:30:52', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('e61373c3-4440-47f5-a57c-8a49a78b33ad', '2022-05-18 16:12:00', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('e61373c3-4440-47f5-a57c-8a49a78b33ad', '2022-05-18 16:12:00', '127.0.0.1', 'admin', '0');
@@ -143,14 +145,13 @@ CREATE TABLE `SYRESOURCE`  (
 -- ----------------------------
 -- ----------------------------
 -- Records of SYRESOURCE
 -- Records of SYRESOURCE
 -- ----------------------------
 -- ----------------------------
-INSERT INTO `SYRESOURCE` VALUES ('06459b40-05e5-4fd2-98cb-2cadf5fb85aa', '2022-05-28 12:56:23', NULL, NULL, '参数删除', 4, NULL, '2022-05-28 12:56:23', NULL, NULL, 'system:config:remove', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
-INSERT INTO `SYRESOURCE` VALUES ('207c5e9c-55c5-423a-aad0-7f532adb4695', '2022-05-28 12:52:58', NULL, NULL, '字典删除', 4, NULL, '2022-05-28 12:52:58', NULL, NULL, 'system:dict:remove', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('27fda67f-61d1-4fe6-8eea-d796a848ab67', '2022-05-28 12:54:39', NULL, 'edit', '参数设置', 6, '', '2022-05-28 12:54:39', 'config', 'system/config/index', 'system:config:list', 'xtgl', '3');
 INSERT INTO `SYRESOURCE` VALUES ('27fda67f-61d1-4fe6-8eea-d796a848ab67', '2022-05-28 12:54:39', NULL, 'edit', '参数设置', 6, '', '2022-05-28 12:54:39', 'config', 'system/config/index', 'system:config:list', 'xtgl', '3');
 INSERT INTO `SYRESOURCE` VALUES ('37ac3cd3-560b-49b3-ae86-96d1963e9db6', '2022-05-28 12:55:59', NULL, NULL, '参数修改', 3, NULL, '2022-05-28 12:55:59', NULL, NULL, 'system:config:edit', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('37ac3cd3-560b-49b3-ae86-96d1963e9db6', '2022-05-28 12:55:59', NULL, NULL, '参数修改', 3, NULL, '2022-05-28 12:55:59', NULL, NULL, 'system:config:edit', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('4621e9f8-e7c6-4c2b-8172-3d8c8ea75371', '2022-05-28 12:55:24', NULL, NULL, '参数新增', 2, NULL, '2022-05-28 12:55:24', NULL, NULL, 'system:config:add', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('4621e9f8-e7c6-4c2b-8172-3d8c8ea75371', '2022-05-28 12:55:24', NULL, NULL, '参数新增', 2, NULL, '2022-05-28 12:55:24', NULL, NULL, 'system:config:add', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('726c7c1e-06f8-4c3e-b9e1-95778a430c07', '2022-05-28 12:51:16', NULL, NULL, '字典查询', 1, NULL, '2022-05-28 12:51:16', NULL, NULL, 'system:dict:query', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('726c7c1e-06f8-4c3e-b9e1-95778a430c07', '2022-05-28 12:51:16', NULL, NULL, '字典查询', 1, NULL, '2022-05-28 12:51:16', NULL, NULL, 'system:dict:query', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('b95cae69-6389-4ebc-b613-bee7aac5f730', '2022-05-28 12:52:26', NULL, NULL, '字典修改', 3, NULL, '2022-05-28 12:52:26', NULL, NULL, 'system:dict:edit', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('b95cae69-6389-4ebc-b613-bee7aac5f730', '2022-05-28 12:52:26', NULL, NULL, '字典修改', 3, NULL, '2022-05-28 12:52:26', NULL, NULL, 'system:dict:edit', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('cc7ff599-a588-40b3-951d-ce9dd2490482', '2022-05-28 12:53:26', NULL, NULL, '字典导出', 5, NULL, '2022-05-28 12:53:26', NULL, NULL, 'system:dict:export', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('cc7ff599-a588-40b3-951d-ce9dd2490482', '2022-05-28 12:53:26', NULL, NULL, '字典导出', 5, NULL, '2022-05-28 12:53:26', NULL, NULL, 'system:dict:export', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
+INSERT INTO `SYRESOURCE` VALUES ('cssc', '2022-05-28 12:56:23', NULL, NULL, '参数删除', 4, NULL, '2022-05-28 12:56:23', NULL, NULL, 'system:config:remove', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('d60df8ae-86ee-4879-b9b9-2fe79f146d31', '2022-05-28 12:55:02', NULL, NULL, '参数查询', 1, NULL, '2022-05-28 12:55:02', NULL, NULL, 'system:config:query', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('d60df8ae-86ee-4879-b9b9-2fe79f146d31', '2022-05-28 12:55:02', NULL, NULL, '参数查询', 1, NULL, '2022-05-28 12:55:02', NULL, NULL, 'system:config:query', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('dd41b52b-272c-49ac-b045-b05392890a8d', '2022-05-28 12:56:49', NULL, NULL, '参数导出', 5, NULL, '2022-05-28 12:56:49', NULL, NULL, 'system:config:export', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('dd41b52b-272c-49ac-b045-b05392890a8d', '2022-05-28 12:56:49', NULL, NULL, '参数导出', 5, NULL, '2022-05-28 12:56:49', NULL, NULL, 'system:config:export', '27fda67f-61d1-4fe6-8eea-d796a848ab67', '1');
 INSERT INTO `SYRESOURCE` VALUES ('edc3358e-b9c5-462f-8a70-7b1c7d7f2c26', '2022-05-28 12:51:53', NULL, NULL, '字典新增', 2, NULL, '2022-05-28 12:51:53', NULL, NULL, 'system:dict:add', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('edc3358e-b9c5-462f-8a70-7b1c7d7f2c26', '2022-05-28 12:51:53', NULL, NULL, '字典新增', 2, NULL, '2022-05-28 12:51:53', NULL, NULL, 'system:dict:add', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
@@ -181,6 +182,7 @@ INSERT INTO `SYRESOURCE` VALUES ('yhjs', '2015-08-25 10:34:53', '编辑用户角
 INSERT INTO `SYRESOURCE` VALUES ('yhlb', '2015-08-25 10:34:53', '查询用户列表', 'ext-icon-bullet_wrench', '用户列表', 0, '', '2015-08-25 10:34:53', NULL, '/base/syuser!grid', 'system:user:list', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhlb', '2015-08-25 10:34:53', '查询用户列表', 'ext-icon-bullet_wrench', '用户列表', 0, '', '2015-08-25 10:34:53', NULL, '/base/syuser!grid', 'system:user:list', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhsc', '2015-08-25 10:34:53', '删除用户', 'ext-icon-bullet_wrench', '删除用户', 3, '', '2015-08-25 10:34:53', NULL, '/base/syuser!delete', 'system:user:remove', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhsc', '2015-08-25 10:34:53', '删除用户', 'ext-icon-bullet_wrench', '删除用户', 3, '', '2015-08-25 10:34:53', NULL, '/base/syuser!delete', 'system:user:remove', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhtj', '2015-08-25 10:34:53', '添加用户', 'ext-icon-bullet_wrench', '添加用户', 1, '', '2015-08-25 10:34:53', NULL, '/base/syuser!save', 'system:user:add', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhtj', '2015-08-25 10:34:53', '添加用户', 'ext-icon-bullet_wrench', '添加用户', 1, '', '2015-08-25 10:34:53', NULL, '/base/syuser!save', 'system:user:add', 'yhgl', '1');
+INSERT INTO `SYRESOURCE` VALUES ('zdsc', '2022-05-28 12:52:58', NULL, NULL, '字典删除', 4, NULL, '2022-05-28 12:52:58', NULL, NULL, 'system:dict:remove', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zybj', '2015-08-25 10:34:53', '编辑资源', 'ext-icon-bullet_wrench', '编辑资源', 2, '', '2015-08-25 10:34:53', NULL, '/base/syresource!update', 'system:menu:edit', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zybj', '2015-08-25 10:34:53', '编辑资源', 'ext-icon-bullet_wrench', '编辑资源', 2, '', '2015-08-25 10:34:53', NULL, '/base/syresource!update', 'system:menu:edit', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zyck', '2015-08-25 10:34:53', '查看资源', 'ext-icon-bullet_wrench', '查看资源', 4, '', '2015-08-25 10:34:53', NULL, '/base/syresource!getById', 'system:menu:query', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zyck', '2015-08-25 10:34:53', '查看资源', 'ext-icon-bullet_wrench', '查看资源', 4, '', '2015-08-25 10:34:53', NULL, '/base/syresource!getById', 'system:menu:query', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zygl', '2015-08-25 10:34:53', '管理系统的资源', 'tree-table', '资源管理', 3, '', '2022-05-25 00:48:32', 'menu', 'system/menu/index', 'system:menu:list', 'xtgl', '0');
 INSERT INTO `SYRESOURCE` VALUES ('zygl', '2015-08-25 10:34:53', '管理系统的资源', 'tree-table', '资源管理', 3, '', '2022-05-25 00:48:32', 'menu', 'system/menu/index', 'system:menu:list', 'xtgl', '0');
@@ -228,6 +230,7 @@ CREATE TABLE `SYROLE`  (
 -- ----------------------------
 -- ----------------------------
 INSERT INTO `SYROLE` VALUES ('0', '2015-08-25 10:34:53', '拥有系统所有权限', NULL, '超管', 0, '2022-05-28 12:12:18');
 INSERT INTO `SYROLE` VALUES ('0', '2015-08-25 10:34:53', '拥有系统所有权限', NULL, '超管', 0, '2022-05-28 12:12:18');
 INSERT INTO `SYROLE` VALUES ('19f00d46-8f1b-45b5-b7b7-6197d7b8cb33', '2016-11-28 14:24:00', NULL, NULL, '管理员', 100, '2022-05-22 12:10:55');
 INSERT INTO `SYROLE` VALUES ('19f00d46-8f1b-45b5-b7b7-6197d7b8cb33', '2016-11-28 14:24:00', NULL, NULL, '管理员', 100, '2022-05-22 12:10:55');
+INSERT INTO `SYROLE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', '2022-05-29 13:29:38', NULL, NULL, '只读用户', 1, '2022-05-29 13:29:38');
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for SYROLE_SYRESOURCE
 -- Table structure for SYROLE_SYRESOURCE
@@ -246,36 +249,49 @@ CREATE TABLE `SYROLE_SYRESOURCE`  (
 -- ----------------------------
 -- ----------------------------
 -- Records of SYROLE_SYRESOURCE
 -- Records of SYROLE_SYRESOURCE
 -- ----------------------------
 -- ----------------------------
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', '27fda67f-61d1-4fe6-8eea-d796a848ab67');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', '726c7c1e-06f8-4c3e-b9e1-95778a430c07');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'd60df8ae-86ee-4879-b9b9-2fe79f146d31');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'ffb8cf26-1049-43ee-9dd5-16e5742ce9d5');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jggl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jggl');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'jggl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jglb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jglb');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'jglb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgsc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgsc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgsq');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgsq');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgtj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jgtj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jsgl');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'jsgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jslb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jslb');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'jslb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jssc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jssc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jssq');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jssq');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jstj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'jstj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'online');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'online');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'onlineGrid');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'onlineGrid');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'xtgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'xtgl');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'xtgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'xtjk');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'xtjk');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhbj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhgl');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'yhgl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhjg');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhjg');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhjs');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhjs');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhlb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhlb');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'yhlb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhsc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhsc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhtj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'yhtj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zybj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zybj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zyck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zyck');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zygl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zygl');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'zygl');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zylb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zylb');
+INSERT INTO `SYROLE_SYRESOURCE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', 'zylb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zysc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zysc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zytj');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zytj');
 
 
@@ -378,7 +394,7 @@ CREATE TABLE `SYS_DICT_TYPE`  (
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`dict_id`) USING BTREE,
   PRIMARY KEY (`dict_id`) USING BTREE,
   UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE
   UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of SYS_DICT_TYPE
 -- Records of SYS_DICT_TYPE
@@ -417,6 +433,7 @@ CREATE TABLE `SYUSER`  (
 -- Records of SYUSER
 -- Records of SYUSER
 -- ----------------------------
 -- ----------------------------
 INSERT INTO `SYUSER` VALUES ('0', 30, '2015-08-25 10:34:54', 'admin', 'admin', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '2022-05-25 11:36:25', NULL);
 INSERT INTO `SYUSER` VALUES ('0', 30, '2015-08-25 10:34:54', 'admin', 'admin', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '2022-05-25 11:36:25', NULL);
+INSERT INTO `SYUSER` VALUES ('0f21b40c-5323-46e5-9200-0364eab3481e', NULL, '2022-05-29 09:28:57', 'test', 'test', NULL, 'e10adc3949ba59abbe56e057f20f883e', NULL, '2022-05-29 09:28:57', '2022-05-29 09:28:57');
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for SYUSER_SYORGANIZATION
 -- Table structure for SYUSER_SYORGANIZATION
@@ -437,6 +454,7 @@ CREATE TABLE `SYUSER_SYORGANIZATION`  (
 -- ----------------------------
 -- ----------------------------
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('0', '0');
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('0', '0');
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('346e8333-b644-4939-8b06-f23654963c6a', '0');
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('346e8333-b644-4939-8b06-f23654963c6a', '0');
+INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('0f21b40c-5323-46e5-9200-0364eab3481e', '5477d9a9-e41e-485f-bb08-697e8facef88');
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for SYUSER_SYROLE
 -- Table structure for SYUSER_SYROLE
@@ -457,5 +475,7 @@ CREATE TABLE `SYUSER_SYROLE`  (
 -- ----------------------------
 -- ----------------------------
 INSERT INTO `SYUSER_SYROLE` VALUES ('0', '0');
 INSERT INTO `SYUSER_SYROLE` VALUES ('0', '0');
 INSERT INTO `SYUSER_SYROLE` VALUES ('346e8333-b644-4939-8b06-f23654963c6a', '19f00d46-8f1b-45b5-b7b7-6197d7b8cb33');
 INSERT INTO `SYUSER_SYROLE` VALUES ('346e8333-b644-4939-8b06-f23654963c6a', '19f00d46-8f1b-45b5-b7b7-6197d7b8cb33');
+INSERT INTO `SYUSER_SYROLE` VALUES ('0', 'f4e1b151-a171-4705-9154-503a046cb72a');
+INSERT INTO `SYUSER_SYROLE` VALUES ('0f21b40c-5323-46e5-9200-0364eab3481e', 'f4e1b151-a171-4705-9154-503a046cb72a');
 
 
 SET FOREIGN_KEY_CHECKS = 1;
 SET FOREIGN_KEY_CHECKS = 1;

+ 2 - 2
ui/src/router/index.js

@@ -99,7 +99,7 @@ export const dynamicRoutes = [
     permissions: ['system:user:edit'],
     permissions: ['system:user:edit'],
     children: [
     children: [
       {
       {
-        path: 'role/:userId(\\d+)',
+        path: 'role/:userId',
         component: () => import('@/views/system/user/authRole'),
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user' }
         meta: { title: '分配角色', activeMenu: '/system/user' }
@@ -113,7 +113,7 @@ export const dynamicRoutes = [
     permissions: ['system:role:edit'],
     permissions: ['system:role:edit'],
     children: [
     children: [
       {
       {
-        path: 'user/:roleId(\\d+)',
+        path: 'user/:roleId',
         component: () => import('@/views/system/role/authUser'),
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
         name: 'AuthUser',
         meta: { title: '分配用户', activeMenu: '/system/role' }
         meta: { title: '分配用户', activeMenu: '/system/role' }