From 8f5d582027b9fe0c7d10f16181caa1096c898f33 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 30 Jul 2024 23:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E5=AF=BC=E5=85=A5=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AwardPersionController.java          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
index 55b6f8d1..2cb7b065 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
@@ -512,6 +512,12 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 					if(list.get(i).getAwardname()==null||list.get(i).getAwardname().equals("")){
 						return Result.error("文件导入失败:第"+(i+1)+"行奖项名称为空");
 					}
+					QueryWrapper<AnnualCompPoint> queryWrapperndbsxm = new QueryWrapper<>();
+					queryWrapperndbsxm.eq("obj_name",list.get(i).getAnnualCompP()).or().eq("id",list.get(i).getAnnualCompP());
+					List<AnnualCompPoint> listndbsxm = annualCompPointService.list(queryWrapperndbsxm);
+					if(listndbsxm.size()==0){
+						return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目不存在");
+					}
 					AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
 					QueryWrapper<AnnualCompetitionProjectRegistration> queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, request.getParameterMap());
 					queryWrappera.eq("annual_compid",list.get(i).getAnnualCompP());
@@ -551,12 +557,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 					if(listndbs.size()==0){
 						return Result.error("文件导入失败:第"+(i+1)+"行年度比赛不存在");
 					}
-					QueryWrapper<AnnualCompPoint> queryWrapperndbsxm = new QueryWrapper<>();
-					queryWrapperndbsxm.eq("obj_name",list.get(i).getAnnualCompP()).or().eq("id",list.get(i).getAnnualCompP());
-					List<AnnualCompPoint> listndbsxm = annualCompPointService.list(queryWrapperndbsxm);
-					if(listndbsxm.size()==0){
-						return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目不存在");
-					}
+
 					try {
 					for (int l = 0 ; l < listtm.size() ; l++){
 						SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());