Merge branch 'develop' into feature/user0812

# Conflicts: # app/admin/service/UserService.php # config/route.php
2025-08-14 10:09:56 +08:00
parent d78567e780 f8da1a1a4b
commit f326665716
19 changed files with 881 additions and 277 deletions
@@ -38,4 +38,13 @@ class RoleService
    {
        return (new RoleLogic)->updateRoleResources($data);
    }
+
+
+    public function getList()
+    {
+        $config['where']['status'] = 1;
+        $config['order']['sort'] = 'asc';
+        $config['order']['id'] = 'asc';
+        return $this->logicListAll($config);
+    }
 }
@@ -72,6 +72,11 @@ class UserService
                }

                $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'report_to', 'status', 'created_at'];
+
+                $config['with']['roles'][] = 'id';
+                $config['with']['roles'][] = 'name';
+                $config['with']['systems'][] = 'id';
+                $config['with']['systems'][] = 'name';
                break;
            case 'show':
                $config['where']['id'] = $p['id'];