From c1a4545735f649bd49a7a92ecffbb426ad651e61 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 30 Jul 2024 20:35:36 +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

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

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 b4b14f9d..06967da0 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
@@ -514,10 +514,14 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 					QueryWrapper<AnnualCompAward> queryWrapperaca = QueryGenerator.initQueryWrapper(annualCompAward, request.getParameterMap());
 					queryWrapperaca.eq("annucompid",list.get(i).getAnnualCompP());
 					List<AnnualCompAward> listaca = annualCompAwardService.list(queryWrapperaca);
+					if(listaca.size()==0){
+						return Result.error("未设置年度比赛奖项");
+					}
 					TeamManagement teamManagement = new TeamManagement();
 					QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap());
 					queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode());
 					List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
+					try {
 					for (int l = 0 ; l < listtm.size() ; l++){
 						SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());
 						list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId());
@@ -555,6 +559,9 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 							return Result.error("文件导入失败:第"+(i+1)+"行奖项名称不存在");
 						}
 					}
+				}catch (Exception e){
+					return Result.error("年度比赛奖项设置中的奖项名称为空，请先设置对应等级的奖项名称");
+				}
 				}
 				//update-begin-author:taoyan date:20190528 for:批量插入数据
 				long start = System.currentTimeMillis();