数据权限

app/models/Role.py

@@ -8,6 +8,10 @@ role_resource_table = db.Table('SYROLE_SYRESOURCE', db.metadata,
                                db.Column('SYROLE_ID', db.String, db.ForeignKey('SYROLE.ID')),
                                db.Column('SYRESOURCE_ID', db.String, db.ForeignKey('SYRESOURCE.ID')))
 
+role_organization_table = db.Table('SYROLE_SYORGANIZATION', db.metadata,
+                               db.Column('SYROLE_ID', db.String, db.ForeignKey('SYROLE.ID')),
+                               db.Column('SYORGANIZATION_ID', db.String, db.ForeignKey('SYORGANIZATION.ID')))
+
 class Role(db.Model, UserMixin):
     __tablename__ = 'SYROLE'
     ID = db.Column(db.Integer, primary_key=True)
@@ -18,12 +22,17 @@ class Role(db.Model, UserMixin):
     ICONCLS = db.Column(db.String(100))
     SEQ = db.Column(db.Integer)
     ROLEKEY = db.Column(db.String(100))
+    DATASCOPE = db.Column(db.Integer)
 
     #包含资源
     resources = db.relationship('Resource',
                                 secondary=role_resource_table,
                                 backref=db.backref('roles', lazy='dynamic')) #资源所属角色
 
+    #包含部门
+    depts = db.relationship('Organization',
+                                secondary=role_organization_table,
+                                backref=db.backref('roles', lazy='dynamic')) #部门所属角色
     def get_id(self):
         return str(self.ID)
 
@@ -44,7 +53,8 @@ class Role(db.Model, UserMixin):
             'iconCls': self.ICONCLS,
             'roleSort': self.SEQ,
             'status': '0',
-            'roleKey': self.ROLEKEY
+            'roleKey': self.ROLEKEY,
+            'dataScope': self.DATASCOPE
         }
 
         

app/routes/role.py

@@ -1,6 +1,8 @@
 # coding:utf-8
 import imp
 from operator import or_
+
+from app.models.Organization import Organization
 from ..base import base
 from ..models import Role, Resource, User
 from flask import render_template, request
@@ -13,19 +15,6 @@ from sqlalchemy import desc
 from sqlalchemy import asc
 from sqlalchemy import or_
 
-@base.route('/securityJsp/base/Syrole.jsp', methods=['GET'])
-def index_role():
-    return render_template('role/index.html')
-
-@base.route('/securityJsp/base/SyroleForm.jsp', methods=['GET'])
-def form_role():
-    return render_template('role/form.html', id=request.args.get('id', ''))
-
-
-@base.route('/securityJsp/base/SyroleGrant.jsp', methods=['GET'])
-def grant_role_page():
-    return render_template('role/grant.html', id=request.args.get('id', ''))
-
 @base.route('/base/syrole!doNotNeedSecurity_getRolesTree.action', methods=['POST'])
 def get_roles_tree():
     roles = Role.query.join(User, Role.users).filter(User.ID == current_user.ID).all()
@@ -92,6 +81,7 @@ def syrole_update():
     role.DESCRIPTION = request.json['remark']
     role.SEQ = request.json['roleSort']
     if 'roleKey' in request.json: role.ROLEKEY = request.json['roleKey']
+    if 'dataScope' in request.json: role.DATASCOPE = request.json['dataScope']
 
     if 'menuIds' in request.json:
         res_list = [Resource.query.get(menuId) for menuId in request.json['menuIds']]
@@ -110,6 +100,7 @@ def syrole_save():
     if 'roleKey' in request.json: role.ROLEKEY = request.json['roleKey']
     if 'remark' in request.json: role.DESCRIPTION = request.json['remark']
     role.SEQ = request.json['roleSort']
+    if 'dataScope' in request.json: role.DATASCOPE = request.json['dataScope']
 
     if 'menuIds' in request.json:
         res_list = [Resource.query.get(menuId) for menuId in request.json['menuIds']]
@@ -149,3 +140,25 @@ def unallocatedList():
     users = pagination.items
 
     return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total})
+
+
+@base.route('/system/dept/roleDeptTreeselect/<id>', methods=['GET'])
+def roleDeptTreeselect(id):
+    role = Role.query.get(id)
+    dept = Organization.query.get('0')
+
+    return jsonify({'code': 200, 'msg': '操作成功', 'checkedKeys': [dept.ID for dept in role.depts], \
+         'depts': [dept.to_tree_select_json()]})
+
+@base.route('/system/role/dataScope', methods=['PUT'])
+def syrole_dataScope():
+    role = Role.query.get(request.json['roleId'])
+
+    if 'dataScope' in request.json: role.DATASCOPE = request.json['dataScope']
+    if 'deptIds' in request.json:
+        dept_list = [Organization.query.get(deptId) for deptId in request.json['deptIds']]
+        role.depts = dept_list
+    
+    db.session.add(role)
+
+    return jsonify({'code': 200, 'msg': '操作成功'})

db.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  File Encoding         : 65001
 
- Date: 08/06/2022 11:14:27
+ Date: 09/06/2022 15:12:45
 */
 
 SET NAMES utf8mb4;
@@ -28,7 +28,7 @@ CREATE TABLE `SYONLINE`  (
   `LOGINNAME` varchar(100) CHARACTER SET gbk COLLATE gbk_chinese_ci NULL DEFAULT NULL,
   `TYPE` varchar(1) CHARACTER SET gbk COLLATE gbk_chinese_ci NULL DEFAULT NULL,
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYONLINE
@@ -95,7 +95,7 @@ CREATE TABLE `SYORGANIZATION`  (
   PRIMARY KEY (`ID`) USING BTREE,
   INDEX `FK_acf7qlb04quthktalwx8c7q69`(`SYORGANIZATION_ID`) USING BTREE,
   CONSTRAINT `FK_acf7qlb04quthktalwx8c7q69` FOREIGN KEY (`SYORGANIZATION_ID`) REFERENCES `SYORGANIZATION` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYORGANIZATION
@@ -116,7 +116,7 @@ CREATE TABLE `SYORGANIZATION_SYRESOURCE`  (
   INDEX `FK_m4mfglk7odi78d8pk9pif44vc`(`SYRESOURCE_ID`) USING BTREE,
   CONSTRAINT `FK_acpjp8a7fjo0cnn02eb0ia6uf` FOREIGN KEY (`SYORGANIZATION_ID`) REFERENCES `SYORGANIZATION` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_m4mfglk7odi78d8pk9pif44vc` FOREIGN KEY (`SYRESOURCE_ID`) REFERENCES `SYRESOURCE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYORGANIZATION_SYRESOURCE
@@ -145,7 +145,7 @@ CREATE TABLE `SYRESOURCE`  (
   INDEX `FK_93qfpiiuk3rwb32gc5mcmmlgh`(`SYRESOURCETYPE_ID`) USING BTREE,
   CONSTRAINT `FK_93qfpiiuk3rwb32gc5mcmmlgh` FOREIGN KEY (`SYRESOURCETYPE_ID`) REFERENCES `SYRESOURCETYPE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_n8kk2inhw4y4gax3nra2etfup` FOREIGN KEY (`SYRESOURCE_ID`) REFERENCES `SYRESOURCE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYRESOURCE
@@ -206,7 +206,7 @@ CREATE TABLE `SYRESOURCETYPE`  (
   `NAME` varchar(100) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL,
   `UPDATEDATETIME` datetime NULL DEFAULT NULL,
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYRESOURCETYPE
@@ -227,15 +227,36 @@ CREATE TABLE `SYROLE`  (
   `NAME` varchar(100) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL,
   `SEQ` int NULL DEFAULT NULL,
   `UPDATEDATETIME` datetime NULL DEFAULT NULL,
+  `ROLEKEY` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色权限字符串',
+  `DATASCOPE` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYROLE
 -- ----------------------------
-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 ('f4e1b151-a171-4705-9154-503a046cb72a', '2022-05-29 13:29:38', NULL, NULL, '只读用户', 1, '2022-05-29 13:29:38');
+INSERT INTO `SYROLE` VALUES ('0', '2015-08-25 10:34:53', '拥有系统所有权限', NULL, '超管', 0, '2022-05-28 12:12:18', '', '1');
+INSERT INTO `SYROLE` VALUES ('19f00d46-8f1b-45b5-b7b7-6197d7b8cb33', '2016-11-28 14:24:00', NULL, NULL, '管理员', 100, '2022-05-22 12:10:55', '', '1');
+INSERT INTO `SYROLE` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', '2022-05-29 13:29:38', NULL, NULL, '只读用户', 1, '2022-05-29 13:29:38', '', '2');
+
+-- ----------------------------
+-- Table structure for SYROLE_SYORGANIZATION
+-- ----------------------------
+DROP TABLE IF EXISTS `SYROLE_SYORGANIZATION`;
+CREATE TABLE `SYROLE_SYORGANIZATION`  (
+  `SYROLE_ID` varchar(36) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL,
+  `SYORGANIZATION_ID` varchar(36) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL,
+  PRIMARY KEY (`SYORGANIZATION_ID`, `SYROLE_ID`) USING BTREE,
+  INDEX `FK_kkrartsovl2frhfvriqdi7jwl`(`SYORGANIZATION_ID`) USING BTREE,
+  INDEX `FK_r139h669pg4ts6mbvn3ip5472`(`SYROLE_ID`) USING BTREE,
+  CONSTRAINT `SYROLE_SYORGANIZATION_ibfk_1` FOREIGN KEY (`SYORGANIZATION_ID`) REFERENCES `SYORGANIZATION` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `SYROLE_SYORGANIZATION_ibfk_2` FOREIGN KEY (`SYROLE_ID`) REFERENCES `SYROLE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of SYROLE_SYORGANIZATION
+-- ----------------------------
+INSERT INTO `SYROLE_SYORGANIZATION` VALUES ('f4e1b151-a171-4705-9154-503a046cb72a', '5477d9a9-e41e-485f-bb08-697e8facef88');
 
 -- ----------------------------
 -- Table structure for SYROLE_SYRESOURCE
@@ -247,9 +268,9 @@ CREATE TABLE `SYROLE_SYRESOURCE`  (
   PRIMARY KEY (`SYRESOURCE_ID`, `SYROLE_ID`) USING BTREE,
   INDEX `FK_kkrartsovl2frhfvriqdi7jwl`(`SYRESOURCE_ID`) USING BTREE,
   INDEX `FK_r139h669pg4ts6mbvn3ip5472`(`SYROLE_ID`) USING BTREE,
-  CONSTRAINT `FK_kkrartsovl2frhfvriqdi7jwl` FOREIGN KEY (`SYRESOURCE_ID`) REFERENCES `SYRESOURCE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `FK_r139h669pg4ts6mbvn3ip5472` FOREIGN KEY (`SYROLE_ID`) REFERENCES `SYROLE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+  CONSTRAINT `FK_r139h669pg4ts6mbvn3ip5472` FOREIGN KEY (`SYROLE_ID`) REFERENCES `SYROLE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `FK_kkrartsovl2frhfvriqdi7jwl` FOREIGN KEY (`SYRESOURCE_ID`) REFERENCES `SYRESOURCE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYROLE_SYRESOURCE
@@ -399,7 +420,7 @@ CREATE TABLE `SYS_DICT_TYPE`  (
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`dict_id`) 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 = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYS_DICT_TYPE
@@ -434,7 +455,7 @@ CREATE TABLE `SYUSER`  (
   `PHONENUMBER` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '手机号码',
   PRIMARY KEY (`ID`) USING BTREE,
   UNIQUE INDEX `UK_eiov1gsncrds3rean3dmu822p`(`LOGINNAME`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYUSER
@@ -454,7 +475,7 @@ CREATE TABLE `SYUSER_SYORGANIZATION`  (
   INDEX `FK_63bdmtxwlk259id13rp4iryy`(`SYUSER_ID`) USING BTREE,
   CONSTRAINT `FK_14ewqc5wtscac0dd5rswrm5j2` FOREIGN KEY (`SYORGANIZATION_ID`) REFERENCES `SYORGANIZATION` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_63bdmtxwlk259id13rp4iryy` FOREIGN KEY (`SYUSER_ID`) REFERENCES `SYUSER` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYUSER_SYORGANIZATION
@@ -475,7 +496,7 @@ CREATE TABLE `SYUSER_SYROLE`  (
   INDEX `FK_1pi4p5h4y5ghbs5f4gdlgn620`(`SYUSER_ID`) USING BTREE,
   CONSTRAINT `FK_1pi4p5h4y5ghbs5f4gdlgn620` FOREIGN KEY (`SYUSER_ID`) REFERENCES `SYUSER` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_j7iwtgslc2esrjx0ptieleoko` FOREIGN KEY (`SYROLE_ID`) REFERENCES `SYROLE` (`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = gbk COLLATE = gbk_chinese_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of SYUSER_SYROLE