diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue
index 362a384..dfc5a7a 100644
--- a/admin/src/views/consumer/lists/index.vue
+++ b/admin/src/views/consumer/lists/index.vue
@@ -54,13 +54,13 @@
- 土地信息
+ 基地信息
diff --git a/admin/src/views/farm/index.vue b/admin/src/views/farm/index.vue
index 7b0ad9e..2aaf4fe 100644
--- a/admin/src/views/farm/index.vue
+++ b/admin/src/views/farm/index.vue
@@ -121,14 +121,21 @@ import { apiFarmLists, apiFarmDelete } from '@/api/farm'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+const { query } = useRoute()
+
+
const editRef = shallowRef>()
// 是否显示编辑框
const showEdit = ref(false)
-
+let user_id = query.user_id
+if (typeof user_id == 'undefined') {
+ user_id = ''
+}
// 查询条件
const queryParams = reactive({
+ user_id: user_id,
farm_name: '',
})
diff --git a/app/adminapi/lists/farm/FarmLists.php b/app/adminapi/lists/farm/FarmLists.php
index c41f041..2b86720 100644
--- a/app/adminapi/lists/farm/FarmLists.php
+++ b/app/adminapi/lists/farm/FarmLists.php
@@ -38,7 +38,7 @@ class FarmLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array
{
return [
- '=' => ['farm_name'],
+ '=' => ['farm_name', 'user_id'],
];
}