Merge branch 'develop'

2025-07-29 09:00:04 +08:00
parent a551507e4d
commit d74b374198
106 changed files with 6754 additions and 1346 deletions
@@ -15,11 +15,65 @@ class UserController extends BaseController
    {
        try {
            $uid = $request->user->uid;
-            $result = (new UserService())->getUserInfo($uid);
+            $systemCode = $request->system_code;
+            $result = (new UserService())->getUserInfo($uid, $systemCode);
            return $this->success($result, '获取用户信息');
        } catch (\Throwable $e) {
            return $this->error($e->getMessage());
        }
    }

+    /**
+     * 用户信息
+     */
+    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());
+        }
+    }
+
+
 }