From 38cd1a9c613e5421b027b1f703e536be06f8ca3d Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Fri, 22 Nov 2024 17:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E9=A1=B9=E7=9B=AE=E4=B8=AD=E6=9F=A5=E7=9C=8B=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E5=A5=96=E9=A1=B9=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AnnualCompAwardController.java             | 8 ++++----
 .../src/views/annualcompaward/AnnualCompAwardList.vue     | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
index c200b48a..15064345 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
@@ -76,7 +76,7 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
     public Result<IPage<AnnualCompAward>> queryPageList(AnnualCompAward annualCompAward,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        HttpServletRequest req) {
+                                                        HttpServletRequest req,@RequestParam(name = "acpid", required = true) String acpid) {
 
         Subject subject = SecurityUtils.getSubject();
         // 获取当前登录用户
@@ -104,7 +104,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
             if (ObjectUtils.isEmpty(compList)) {
                 return Result.OK(page);
             }
-            //获取比赛ID
+            queryWrapper.eq(AnnualCompAward::getAnnucompid,acpid);
+ /*           //获取比赛ID
             Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
             //根据比赛ID查询年度必死啊
             List<AnnualComp> annualCompList = annualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
@@ -118,9 +119,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
                     Set<String> annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet());
                     queryWrapper.in(AnnualCompAward::getAnnucompid, annualCompPointIds);
                 }
-            }
+            }*/
         }
-
         annualCompAwardService.page(page, queryWrapper);
 
 //        Page<AnnualCompAwardvo> page1 = new Page<>();
diff --git a/jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue b/jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue
index b0d204c6..02307d98 100644
--- a/jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue
@@ -54,6 +54,7 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnnualCompAward.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import {useRoute} from "vue-router";
+  const route = useRoute()
 
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
@@ -73,6 +74,9 @@
         fieldMapToNumber: [],
         fieldMapToTime: [],
       },
+      beforeFetch: (params) => {
+        return Object.assign(params, {acpid:route.query.acpid});
+      },
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -89,7 +93,6 @@
   });
 
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
-const route = useRoute()
   /**
    * 新增事件
    */