From 6996e5c4b869480d28307b56b1752d716576266e Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 22:43:33 +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, 3 insertions(+), 4 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 91e6e9dd..acfbb31a 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 @@ -539,12 +539,11 @@ public class AwardPersionController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap()); queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode()); List 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());