diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java index efa2635..e39383b 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java @@ -9,6 +9,7 @@ import com.chinagas.common.log.annotation.Log; import com.chinagas.common.log.enums.BusinessType; import com.chinagas.common.security.annotation.RequirePermission; import com.chinagas.modules.schsf.domain.McIgnition; +import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.service.IMcIgnitionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,7 +58,7 @@ public class McIgnitionController extends BaseController if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){ throw new RuntimeException("确认状态不可为空"); } - if (mcIgnition.getIgnTime()==null){ + if ( mcIgnition.getIgnCnfStatusCode().equals(YesNoEnums.Y.getName()) && mcIgnition.getIgnTime()==null){ throw new RuntimeException("点火时间不可为空"); } return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition)); -- libgit2 0.21.2