用户，角色，权限增加是否启用，修补菜单排序

applications/service/admin/index.py

@@ -30,8 +30,12 @@ def add_auth_session():
     role = current_user.role
     user_power = []
     for i in role:
-        for y in i.power:
-            user_power.append(y.code)
+        if i.enable == 0:
+            continue
+        for p in i.power:
+            if p.enable == 0:
+                continue
+            user_power.append(p.code)
     session['permissions'] = user_power
 
 
@@ -46,19 +50,24 @@ def make_menu_tree():
     role = current_user.role
     power0 = []
     power1 = []
-    print(role)
     for i in role:
-        for y in i.power:
-            if int(y.type) == 0:
-                power0.append(y)
+        if i.enable == 0:
+            continue
+        for p in i.power:
+            if p.enable == 0:
+                continue
+            if int(p.type) == 0:
+                power0.append(p)
             else:
-                power1.append(y)
+                power1.append(p)
 
     power_schema = PowerSchema(many=True)  # 用已继承ma.ModelSchema类的自定制类生成序列化类
     power0_dict = power_schema.dump(power0)  # 生成可序列化对象
     power1_dict = power_schema.dump(power1)  # 生成可序列化对象
-    print(power0)
-    print(power1)
+    power0_dict = sorted(power0_dict, key=lambda i: i['sort'])
+    power1_dict = sorted(power1_dict, key=lambda i: i['sort'])
+    # print(power0)
+    # print(power1)
 
     menu = []