[智价云] 日志查询更新

app/Http/Controllers/Manager/AdminHistory.php

@@ -33,12 +33,12 @@ class AdminHistory extends Controller
         $general_description = request('general_description', '');
         $notes_type = request('notes_type', '');
         // 时间条件
-        if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
-        if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
+        if ($start_time) $map[] = ['admin_history.insert_time', '>=', strtotime($start_time)];
+        if ($end_time) $map[]   = ['admin_history.insert_time', '<=', strtotime($end_time)];
         // 其他条件
-        if ($module_menu_name) $map[] = ['module_menu_name', 'like', "%$module_menu_name%"];
-        if ($general_description) $map[] = ['general_description', 'like', "%$general_description%"];
-        if ($notes_type) $map[] = ['notes_type', '=', $notes_type];
+        if ($module_menu_name) $map[] = ['admin_history.module_menu_name', 'like', "%$module_menu_name%"];
+        if ($general_description) $map[] = ['admin_history.general_description', 'like', "%$general_description%"];
+        if ($notes_type) $map[] = ['admin_history.notes_type', '=', $notes_type];
         // 查询数据
         $result = $AdminHistoryModel->join('admin', 'admin.uid', '=', 'admin_history.admin_uid')
             ->where($map)