Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -26,9 +26,19 @@ class ManagerLogController extends BaseController
      * @time   :2024/12/4 16:51
      * @time   :2024/12/4 16:51
      */
      */
     public function logList(ManageLog $manageLog){
     public function logList(ManageLog $manageLog){
+        $managerModel = new Manage();
+        if(isset($this->map['name']) && !empty($this->map['name'])){
+            $ids = $managerModel->where('name', 'like', '%' . $this->param['name'] . '%')->pluck('id')->toArray();
+            $this->map['manage_id'] = ['in',$ids];
+        }
+        if(isset($this->map['url']) && !empty($this->map['url'])){
+            $this->map['url'] = ['like','%'.$this->map['url'].'%'];
+        }
+        if(isset($this->map['ip']) && !empty($this->map['ip'])){
+            $this->map['ip'] = ['like','%'.$this->map['ip'].'%'];
+        }
         $lists = $manageLog->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $manageLog->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
-            $managerModel = new Manage();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['name'] = $managerModel->getName($v['manage_id']);
                 $v['name'] = $managerModel->getName($v['manage_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;