接口编写

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelConfigServiceImpl.java

@@ -322,8 +322,8 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
         where.eq(InstrumentPanelConfig::getPanelId, instrumentPanelId);
         where.eq(InstrumentPanelConfig::getPublished, published.value);
         InstrumentPanelConfig config = baseMapper.selectOne(where);
+        InstrumentPanelConfigVo vo=new InstrumentPanelConfigVo();
         if(ObjectUtils.isNotEmpty(config)) {
-            InstrumentPanelConfigVo vo = new InstrumentPanelConfigVo();
             BeanUtils.copyProperties(config, vo);
             if (ObjectUtils.isNotEmpty(vo)) {
                 try {
@@ -332,21 +332,20 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
                     e.printStackTrace();
                     throw new SysException("仪表板配置详情解密异常");
                 }
-                vo.setPermissions(permissionService.getPublishPermissionByPanelId(instrumentPanelId, published.value));
-                InstrumentPanelVo panelVo = new InstrumentPanelVo();
-                if (PublishedStatus.PUBLISHED.value.equals(published.value)) {
-                    InstrumentPanelDraft panel = draftService.getByPanelId(instrumentPanelId);
-                    BeanUtils.copyProperties(panel, panelVo);
-
-                } else {
-                    InstrumentPanel panel = panelService.getById(instrumentPanelId);
-                    BeanUtils.copyProperties(panel, panelVo);
-                }
-                vo.setPanel(panelVo);
-                return vo;
             }
         }
-        return null;
+        vo.setPermissions(permissionService.getPublishPermissionByPanelId(instrumentPanelId, published.value));
+        InstrumentPanelVo panelVo = new InstrumentPanelVo();
+        if (PublishedStatus.PUBLISHED.value.equals(published.value)) {
+            InstrumentPanelDraft panel = draftService.getByPanelId(instrumentPanelId);
+            BeanUtils.copyProperties(panel, panelVo);
+        } else {
+            InstrumentPanel panel = panelService.getById(instrumentPanelId);
+            BeanUtils.copyProperties(panel, panelVo);
+            vo.setPanelId(instrumentPanelId);
+        }
+        vo.setPanel(panelVo);
+        return vo;
     }
 
     private void fillPanelProp(InstrumentPanelPermissionDTO permission, InstrumentPanel panel,String publishStatus) {