Merge branch 'develop' into feature/user0812

# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php

app/common/service/ResourceService.php

@@ -95,19 +95,32 @@ class ResourceService
 
     protected function afterServiceListAll($data)
     {
-        $data = Tree::buildWithAuthListAndReference($data->toArray());
+        $data = Tree::buildMenuTreeWithReference($data->toArray());
         return $data;
     }
 
     protected function afterServiceMenuList($data)
     {
-        $data = Tree::buildWithReference($data->toArray());
+        $data = Tree::buildMenuTree($data->toArray());
         return $data;
     }
 
     protected function afterServiceMenuTreeList($data)
     {
-        $data = Tree::buildWithReference($data->toArray());
+        $data = Tree::buildMenuTree($data->toArray());
+        return $data;
+    }
+
+
+    public function beforeServiceStore($data, Request $request)
+    {
+        $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0;
+        return $data;
+    }
+
+    public function beforeServiceUpdate($data, Request $request)
+    {
+        $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0;
         return $data;
     }
 }

app/common/service/UserService.php

@@ -34,9 +34,9 @@ class UserService
     public function getUserInfo(int $uid, string $systemCode)
     {
         $user = $this->logic->userInfo($uid);
-        $permService = new PermService();
-        $menuTree = $permService->getMenuTree($uid, $systemCode);
-        $permissionCodes = $permService->getPermissionCodes($uid, $systemCode);
+        // $permService = new PermService();
+        // $menuTree = $permService->getMenuTree($uid, $systemCode);
+        // $permissionCodes = $permService->getPermissionCodes($uid, $systemCode);
         return [
             'user' => [
                 'id' => $user->id,
@@ -47,8 +47,8 @@ class UserService
                 'status' => $user->status,
                 'roles' => $user->roles->pluck('name')
             ],
-            'menu' => $menuTree, 
-            'permissions' => $permissionCodes
+            // 'menu' => $menuTree, 
+            // 'permissions' => $permissionCodes
         ];
     }