奖项导入报错提示

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java

@@ -539,12 +539,11 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 					QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap());
 					queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode());
 					List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
-					try {
-						list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid()));
-					}catch (Exception e){
+					if(annualService.getannualthisid(list.get(i).getAnnualid())==null){
 						return Result.error("文件导入失败:第"+(i+1)+"行年度不存在");
+					}else{
+						list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid()));
 					}
-
 					try {
 					for (int l = 0 ; l < listtm.size() ; l++){
 						SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());