Merge branch 'develop'

2025-09-16 10:53:57 +08:00
parent b399f85707
commit 62c32d25ff
210 changed files with 15388 additions and 95 deletions
@@ -52,6 +52,9 @@ class UserService
                'sn' => $user->sn,
                'corp_id' => $user->corp_id,
                'corp_name' => $corp_name,
+                'report_to' => $user->report_to,
+                'sign_img' => $user->sign_img,
+                'sign_img_url' => (!empty($user->sign_img))?(new \app\common\service\OssService)->generatePrivateUrl($user->sign_img):'',
            ],
            // 'menu' => $menuTree, 
            // 'permissions' => $permissionCodes
@@ -84,7 +87,9 @@ class UserService
            'email' => $user->email,
            'sex' => $user->sex,
            'status' => $user->status,
-            'roles' => $user->roles->pluck('name')
+            'roles' => $user->roles->pluck('name'),
+            'sign_img' => $user->sign_img,
+            'sign_img_url' => (!empty($user->sign_img))?$ossservice->generatePrivateUrl($user->sign_img):'',
        ];
    }