Merge branch 'feature/user0812' into develop

2025-08-14 19:49:29 +08:00
parent e5fa0a18f9 5ae97c9fee
commit d7d14e8d44
4 changed files with 14 additions and 1 deletions
@@ -46,7 +46,7 @@ class UserController extends BaseController
    public function resignMember(Request $request)
    {
        try {
-            $userId = $request->post('user_id');
+            $userId = $request->get('user_id');
            if(empty($userId)){
                return $this->error('组员id不能为空');
            }
@@ -185,6 +185,10 @@ class UserService
 //                $config['where']['status'] = 1;                // 关键字
                $config['order']['id'] = 'desc';

+                if (isset($p['status']) && $p['status']) {
+                    $config['where']['status'] = $p['status'];
+                }
+
                $config['dataLimit']['type'] = 'relation';
                $config['dataLimit']['userId'] = $request->user->uid;
                $config['dataLimit']['userField'] = 'report_to';