From b678d6729fa4db00724c6bed140a5749220ae0ae Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 12 May 2021 15:49:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/buildrecord/rest/BuildRecordController.java | 4 ++-- .../buildrecord/service/impl/BuildRecordServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/rest/BuildRecordController.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/rest/BuildRecordController.java index 740757d..13cdb0a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/rest/BuildRecordController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/rest/BuildRecordController.java @@ -180,7 +180,7 @@ public class BuildRecordController { return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.EMPTY_ARGUMENT), HttpStatus.OK); } //判断内容是否含有不良词 - if(buildRecordSendVO.getRemoteRecord() != null){ + /* if(buildRecordSendVO.getRemoteRecord() != null){ if (!StringUtils.isBlank(buildRecordSendVO.getRemoteRecord().getSmsContent())){ WordFilter wf = new WordFilter(); String filter_search = wf.filter_search(buildRecordSendVO.getRemoteRecord().getSmsContent()); @@ -188,7 +188,7 @@ public class BuildRecordController { return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_SMS_BAD), HttpStatus.OK); } } - } + }*/ SendBigDataDTO sendBigDataDTO = new SendBigDataDTO(); BeanUtil.copyProperties(buildRecordSendVO, sendBigDataDTO); // 调用发送课包任务,开始发送 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java index fb1f46e..33d489b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java @@ -91,7 +91,8 @@ public class BuildRecordServiceImpl implements BuildRecordService { @Override @Transactional(rollbackFor = Exception.class) public BuildRecordDto create(BuildRecord resources) { - if (resources.getLevel().equals(DefaultConstant.ONE_NUMBER)) { + if (resources.getLevel() != null && + resources.getLevel().equals(DefaultConstant.ONE_NUMBER)) { resources.setParentId(DefaultConstant.ZERO_NUMBER); } return buildRecordMapper.toDto(buildRecordRepository.save(resources));