Merge branch 'develop' into feature/mzl_dev_curd

app/common/controller/UserController.php

@@ -22,4 +22,57 @@ class UserController extends BaseController
         }
     }
 
+    /**
+     * 用户信息
+     */
+    public function getUser(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $corp_abbr = $request->basic_data['corp_abbr'];
+            $result = (new UserService())->getUser($uid,$corp_abbr);
+            return $this->success($result, '获取用户信息');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 编辑用户
+     */
+    public function edit(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $data = $request->all();
+            $result = (new UserService())->edit($uid,$data);
+            unset($result['password']);
+            unset($result['union_id']);
+            unset($result['open_id']);
+            unset($result['tenant_key']);
+            return $this->success($result, '编辑成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 修改密码
+     * @param Request $request
+     * @return \support\Response
+     * @throws \Random\RandomException
+     */
+    public function savePassword(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $data = $request->all();
+            $result = (new UserService())->savePassword($uid,$data);;
+            return $this->success($result, '编辑成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+
 }

app/common/logic/PermLogic.php

@@ -102,7 +102,7 @@ class PermLogic
             // component 字段规则：
             // 1. 存在子菜单，固定 '/index/index'
             // 2. 否则为当前完整路径（或其它你想要的）
-            $componentValue = $hasChildrenMenu ? '/index/index' : $currentPath;
+            $componentValue = ($hasChildrenMenu && !$node->url && $node->type !== 'directory') ? '/index/index' : $currentPath;
 
             $tree[] = [
                 'id'        => $node->id,

app/common/logic/UserLogic.php

@@ -24,4 +24,33 @@ class UserLogic
         
         return $user;
     }
+
+    /**
+     * 用户信息
+     */
+    public function edit(int $uid, array $data)
+    {
+        $user = User::find($uid);
+
+        if (!$user) {
+            throw new BusinessException('账户不存在', 404);
+        }
+
+        $user->fill($data);
+        $user->save();
+
+        return $user;
+    }
+
+    /**
+     * 修改密码
+     */
+    public function savePassword(int $uid, array $data)
+    {
+        $password = password_hash($data['password_new'], PASSWORD_DEFAULT);
+        $res = User::where('id',$uid)->update(['password' => $password]);
+
+        return $res;
+    }
+
 }

app/common/model/Role.php

@@ -53,6 +53,6 @@ class Role extends Model
     // 角色拥有的资源（权限点、菜单）
     public function resources()
     {
-        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id')->orderBy('sort', 'asc');
+        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id');
     }
 }

app/common/model/User.php

@@ -54,6 +54,7 @@ class User extends Model
         'sn',
         'name',
         'avatar',
+        'sex',
         'password',
         'phone',
         'email',
@@ -63,7 +64,11 @@ class User extends Model
         'union_id',
         'user_id',
         'open_id',
-        'tenant_key'
+        'tenant_key',
+        'country_id',
+        'position',
+        'socialize',
+        'socialize_pic',
     ];
     
     // 用户所有角色

app/common/service/AuthService.php

@@ -31,7 +31,7 @@ class AuthService
 
         return match ($loginType) {
             'feishu'  => $logic->feishuLogin($data),
-            // 'qrcode'  => $logic->qrCodeLogin($data),
+            'qrcode'  => $logic->qrCodeLogin($data),
             default   => $logic->uPwdLogin($data),
         };
     }
@@ -86,13 +86,4 @@ class AuthService
     {
         (new AuthLogic())->blockToken($token, $systemCode);
     }
-
-
-    // public function perms()
-    // {
-    //     $permService = new PermService();
-    //     $menuTree = $permService->getMenuTree($uid);
-    //     $permissionCodes = $permService->getPermissionCodes($uid);
-    //     return (new PermService())->getMenuTree($this->userId)
-    // }
 }

app/common/service/UserService.php

@@ -3,6 +3,10 @@
 namespace app\common\service;
 
 use app\common\logic\UserLogic;
+use app\common\model\Corp;
+use app\common\model\User;
+use app\crm\model\Country;
+use support\exception\BusinessException;
 
 class UserService
 {
@@ -37,4 +41,62 @@ class UserService
             'permissions' => $permissionCodes
         ];
     }
+
+
+    /**
+     * 获取用户信息（包括菜单和权限）
+     */
+    public function getUser(int $uid, $corp_abbr)
+    {
+        $user = $this->logic->userInfo($uid);
+        $corp_name = Corp::where('abbr', $corp_abbr)->value('name');
+        $ossservice = new OssService();
+        return [
+            'id' => $user->id,
+            'name' => $user->name,
+            'position' => $user->position,
+            'socialize' => $user->socialize,
+            'socialize_pic' => $user->socialize_pic,
+            'socialize_pic_full' => (!empty($user->socialize_pic))?$ossservice->generatePrivateUrl($user->socialize_pic):'',
+            'country_id' => $user->country_id,
+            'country_txt' => Country::where('id',$user->country_id)->value('cn_addr'),
+            'avatar' => $user->avatar,
+            'avatar_full' => (!empty($user->avatar))?$ossservice->generatePrivateUrl($user->avatar):'',
+            'phone' => $user->phone,
+            'corp_name' => $corp_name,
+            'email' => $user->email,
+            'status' => $user->status,
+            'roles' => $user->roles->pluck('name')
+        ];
+    }
+
+    /**
+     * 编辑用户信息
+     */
+    public function edit(int $uid, array $data)
+    {
+        unset($data['password']);
+        unset($data['phone']);
+        unset($data['email']);
+        unset($data['sn']);
+
+        $user = $this->logic->edit($uid,$data);
+        return $user;
+    }
+
+    /**
+     * 修改用户密码
+     */
+    public function savePassword(int $uid, array $data)
+    {
+        // 对密码进行哈希处理
+        $password = $data['password'];
+        $user = User::find($uid);
+        if (!password_verify($password, $user->password)) {
+            throw new BusinessException('密码错误');
+        }
+
+        $user = $this->logic->savePassword($uid,$data);
+        return $user;
+    }
 }