合并分支 'dev_hhq' 到 'master'

src/views/thinkTank/ThinkTankDetail/PolicyTracking/index.vue

@@ -380,7 +380,7 @@ const box3Data = ref({
 	// ]
 });
 
-const box3SelectYear = ref("2024");
+const box3SelectYear = ref("2025");
 const box3YearList = ref([
 	{
 		label: "2025",

src/views/thinkTank/ThinkTankDetail/thinkDynamics/index.vue

@@ -308,21 +308,31 @@ const handleCurrentChange = page => {
 	handleGetThinkDynamicsReport()
 };
 
+function arrayToString(arr) {
+	return arr.reduce((acc, item) => {
+		if (item !== null && item !== undefined && item !== "") {
+			return acc === "" ? item : acc + "," + item;
+		}
+		return acc;
+	}, "");
+}
+
 // 获取智库动态报告
 const handleGetThinkDynamicsReport = async () => {
-	console.log(selectedReportTypeList.value, 'selectedReportTypeList.value')
-	console.log(selectedResearchTypeList.value, 'selectedResearchTypeList.value')
+
 	try {
 		const parmas = {
 			id: router.currentRoute._value.params.id,
 			startDate: getDateYearsAgo(selectedYear.value),
 			parmas: {
+				searchText: searchReport.value,
+				authorName: author.name,
 				sortFun: sort.value,
 				authorName: author.value ? author.value : null,
-				currentPage: currentPage.value,
+				currentPage: currentPage.value - 1,
 				pageSize: 12,
-				reportTypeIds: selectedReportTypeList.value ? selectedReportTypeList.value : null,
-				researchTypeIds: selectedResearchTypeList.value ? selectedResearchTypeList.value : null
+				reportTypeIds: arrayToString(selectedReportTypeList.value) === '' ? null : arrayToString(selectedResearchTypeList.value),
+				researchTypeIds: arrayToString(selectedResearchTypeList.value) === '' ? null : arrayToString(selectedResearchTypeList.value)
 			}
 
 		}
@@ -331,6 +341,9 @@ const handleGetThinkDynamicsReport = async () => {
 		if (res.code === 200 && res.data) {
 			curFooterList.value = res.data.content
 			total.value = res.data.totalElements
+		} else if (res.code === 500 && res.message === '未找到对应筛选的报告') {
+			curFooterList.value = []
+			total.value = 0
 		}
 	} catch (error) {
 		console.error("获取智库动态报告error", error);