Merge branch 'develop'

2025-09-16 10:53:57 +08:00
parent b399f85707
commit 62c32d25ff
210 changed files with 15388 additions and 95 deletions
@@ -90,6 +90,9 @@ class UserService
                if (isset($p['id']) && $p['id']) {
                    $config['where']['id'] = $p['id'];
                }
+                if (isset($p['corp_id']) && $p['corp_id']) {
+                    $config['where']['corp_id'] = $p['corp_id'];
+                }

                $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'report_to', 'status', 'created_at'];

@@ -113,6 +116,7 @@ class UserService
                $config['where']['id'] = $p['id'];
                break;
            case 'edit':
+            case 'updateSign':
                $config['where']['id'] = $request->user->uid;
                break;
        }
@@ -154,4 +158,13 @@ class UserService
        $user = $this->logicUpdateBy($config,$data);
        return $user;
    }
+
+
+
+    public function serviceUpdateSign(Request $request, array $data)
+    {
+        $config = $this->buildQueryConfig($request, 'updateSign');
+        $user = $this->logicUpdateBy($config,$data);
+        return $user;
+    }
 }