diff --git a/mes-module-heli/mes-module-heli-biz/.flattened-pom.xml b/mes-module-heli/mes-module-heli-biz/.flattened-pom.xml deleted file mode 100644 index 31852fa2..00000000 --- a/mes-module-heli/mes-module-heli-biz/.flattened-pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-module-heli - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-heli-biz - 2.0.0-jdk8-snapshot - ${project.artifactId} - 合立业务模块 - - - com.chanko.yunxi - mes-module-system-api - ${revision} - - - com.chanko.yunxi - mes-module-heli-api - ${revision} - - - com.chanko.yunxi - mes-module-system-biz - ${revision} - - - com.chanko.yunxi - mes-module-infra-biz - ${revision} - - - com.chanko.yunxi - mes-spring-boot-starter-biz-operatelog - - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - - - com.chanko.yunxi - mes-spring-boot-starter-security - - - com.chanko.yunxi - mes-spring-boot-starter-websocket - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - - - com.baomidou - mybatis-plus-generator - - - javax.annotation - javax.annotation-api - 1.3.2 - - - com.chanko.yunxi - mes-spring-boot-starter-redis - - - com.chanko.yunxi - mes-spring-boot-starter-job - - - com.chanko.yunxi - mes-spring-boot-starter-mq - - - com.chanko.yunxi - mes-spring-boot-starter-excel - - - org.apache.velocity - velocity-engine-core - - - cn.smallbun.screw - screw-core - - - com.chanko.yunxi - mes-spring-boot-starter-monitor - - - de.codecentric - spring-boot-admin-starter-server - - - com.chanko.yunxi - mes-spring-boot-starter-file - - - com.github.dadiyang - equator - 1.0.4 - - - diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java index 3ffb3bf3..fb3bca25 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java @@ -57,6 +57,9 @@ public class TaskInReportServiceImpl implements TaskInReportService { @Override public void rework(Long id, String remark) { TaskInReportDO taskInReportDO = taskInReportMapper.selectById(id); + if (taskInReportDO == null) { + throw exception(TASK_IN_REPORT_NOT_EXISTS); + } TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskInReportDO.getDispatchDetailId()); if (taskDispatchDetailDO != null) { if (taskDispatchDetailDO.getInReportProcess() != 2) {