修改年度比赛项目中查看比赛奖项管理数据问题

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<>();

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()
   /**
    * 新增事件
    */