角色授权用户

app/routes/role.py

@@ -27,16 +27,29 @@ def get_roles_by_userId():
 
 
 @base.route('/system/role/authUser/cancelAll', methods=['PUT'])
-def grant_role():
+def cancel_all_role():
     roleId = request.args.get('roleId')
     userIds = request.args.get('userIds')
 
-    role = Role.query.get(roleId)
+    #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 ]
+    #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 ]
+    for userId in idList:
+        user = User.query.get(userId)
+        user.roles = [role for role in user.roles.all() if role.ID != roleId]
+        db.session.add(user)
 
-    db.session.add(role)
+    return jsonify({'code': 200, 'msg': '取消成功'})
+
+@base.route('/system/role/authUser/cancel', methods=['PUT'])
+def cancel_role():
+    roleId = request.json.get('roleId')
+    userId = request.json.get('userId')
+
+    user = User.query.get(userId)
+    user.roles = [role for role in user.roles.all() if role.ID != roleId]
+    db.session.add(user)
 
     return jsonify({'code': 200, 'msg': '取消成功'})
 
@@ -161,4 +174,17 @@ def syrole_dataScope():
     
     db.session.add(role)
 
+    return jsonify({'code': 200, 'msg': '操作成功'})
+
+@base.route('/system/role/authUser/selectAll', methods=['PUT'])
+def syrole_authUser_selectAll():
+    role = Role.query.get(request.args.get('roleId'))
+    userIds = request.args.get('userIds')
+
+    idList = userIds.split(',')
+    for userId in idList:
+        user = User.query.get(userId)
+        user.roles.append(role)
+        db.session.add(user)
+
     return jsonify({'code': 200, 'msg': '操作成功'})