Merge branch 'release'

2025-11-03 18:16:51 +08:00
parent a0935c4332
commit 359755fdf1
38 changed files with 2339 additions and 36 deletions
@@ -118,6 +118,11 @@ class UserController extends BaseController
                $data['system_ids'][] = $system['id'];
            }
        }
+        if ($data['reportToInfo']) {
+            $data['report_to_name'] = $data['reportToInfo']['id'] == $data['id'] ? '/' : $data['reportToInfo']['name'];
+        } else {
+            $data['report_to_name'] = '-';
+        }
        return $data;
    }