Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev

2025-08-12 15:27:39 +08:00
parent 360aeec0e1 55dea2dae2
commit 8333517465
12 changed files with 131 additions and 35 deletions
@@ -55,6 +55,9 @@ class UserService
                    $k = '%' . $p['keyword'] . '%';
                    $config['where']['name'] = ['like', $k];
                }
+                if (isset($p['user_id']) && $p['user_id']) {
+                    $config['where']['user_id'] = $p['user_id'];
+                }
                if (isset($p['id']) && $p['id']) {
                    $config['where']['id'] = $p['id'];
                }