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
@@ -87,6 +87,19 @@ class UserController extends BaseController

        $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
        $data['customer_count'] = Customer::where('user_id', $data['id'])->count();
+        
+        $data['role_ids'] = [];
+        $data['system_ids'] = [];
+        if (isset($data['roles']) && count($data['roles']) > 0) {
+            foreach ($data['roles'] as $role) {
+                $data['role_ids'][] = $role['id'];
+            }
+        }
+        if (isset($data['systems']) && count($data['systems']) > 0) {
+            foreach ($data['systems'] as $system) {
+                $data['system_ids'][] = $system['id'];
+            }
+        }
        return $data;
    }