Merge remote-tracking branch 'origin/develop' into develop

7d36fd49 · 梁光意 · f6956eeb · ca27511f · 7d36fd49
Commit 7d36fd49 authored May 07, 2021 by 梁光意
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

InstrumentPanelServiceImpl.java ...yc/slm/slmbi/service/impl/InstrumentPanelServiceImpl.java +4 -2

No files found.
--- a/src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelServiceImpl.java
+++ b/src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelServiceImpl.java
@@ -156,8 +156,10 @@ public class InstrumentPanelServiceImpl extends ServiceImpl<InstrumentPanelMappe
        delAllSetting(id);
        log.info("删除仪表板草稿表");
        InstrumentPanelDraft draft =draftService.getByPanelId(id);
-        draft.setRecordStatus(SlmConstants.DATA_DELETED);
-        draftService.updateById(draft);
+        if(ObjectUtils.isNotEmpty(draft)) {
+            draft.setRecordStatus(SlmConstants.DATA_DELETED);
+            draftService.updateById(draft);
+        }
        return id;
    }