diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 506a0e6..9ee1f03 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -457,7 +457,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { BeanUtils.copyProperties(wxMode, wxModeRet); if (wxMode.getInstrumentType() == 2) { // IOT仪器才可以设置模式时长 - wxModeRet.setModeTime(LocalTime.of(0, wxMode.getModeTime())); + if(wxMode.getModeTime() != null) { + wxModeRet.setModeTime(LocalTime.ofSecondOfDay(wxMode.getModeTime())); + } } Boolean isLock = false; if (wxModeTagList != null && wxModeTagList.size() > 0) { diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue index 3ed1c0d..469d434 100644 --- a/flossom-ui/src/views/system/mode/index.vue +++ b/flossom-ui/src/views/system/mode/index.vue @@ -38,7 +38,11 @@ - + + +