From b4f8febec95bb030ae214b6a33eca2e46a99fbe2 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 20 Nov 2020 19:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 3 +++ mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 41f609c3..f8bfb42b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1472,6 +1472,9 @@ public class CompeteService implements ICompeteService { //场次表里面的东西 CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); + if(competeStartOrder1==null){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } selScropeVo.setWaiver(competeStartOrder1.getWaiver()); //项目表里面的东西 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 84855e86..006938c2 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -223,7 +223,7 @@ public class ExcelService implements IExcelService { //查出教练和领队的list List jLandLD=competeCompanyDao.selectByCompanyId(com.getId()); CompetePlayerExample competePlayerExample=new CompetePlayerExample(); - competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()); + competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0); //运动员list List competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);