fix: 修复数据看板在编辑的情况下,把数据看板的layout设置为了null

@@ -134,6 +134,6 @@ public class TkDataBoardController extends BaseController {
   private ResponseResult<DataBoardDTO> saveOrUpdate(DataBoardDTO dataBoard)
   private ResponseResult<DataBoardDTO> saveOrUpdate(DataBoardDTO dataBoard)
       throws ThingsboardException {
       throws ThingsboardException {
     dataBoard.setTenantId(getCurrentUser().getCurrentTenantId());
     dataBoard.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseResult.success(tkDataBoardService.saveOrUpdateDataBoard(dataBoard));
+    return ResponseResult.success(tkDataBoardService.saveOrUpdateDataBoard(dataBoard,false));
   }
   }
 }
 }

@@ -141,7 +141,7 @@ public class TkDataComponentController extends BaseController {
         }
         }
       }
       }
       dto.setLayout(layoutResult);
       dto.setLayout(layoutResult);
-      ytDataBoardService.saveOrUpdateDataBoard(dto);
+      ytDataBoardService.saveOrUpdateDataBoard(dto,true);
     }
     }
     return ResponseResult.success(result);
     return ResponseResult.success(result);
   }
   }

@@ -79,7 +79,7 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO) {
+  public DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO,boolean byDeleteDataComponent) {
     TkDataBoardEntity dataBoard = dataBoardDTO.getEntity(TkDataBoardEntity.class);
     TkDataBoardEntity dataBoard = dataBoardDTO.getEntity(TkDataBoardEntity.class);
     if(null != dataBoardDTO.getViewType() && dataBoardDTO.getViewType().equals(ViewType.PRIVATE_VIEW)){
     if(null != dataBoardDTO.getViewType() && dataBoardDTO.getViewType().equals(ViewType.PRIVATE_VIEW)){
       dataBoard.setAccessCredentials(null);
       dataBoard.setAccessCredentials(null);
@@ -96,6 +96,9 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
               new LambdaQueryWrapper<TkDataBoardEntity>()
               new LambdaQueryWrapper<TkDataBoardEntity>()
                   .eq(TkDataBoardEntity::getId, dataBoardDTO.getId())
                   .eq(TkDataBoardEntity::getId, dataBoardDTO.getId())
                   .eq(TkDataBoardEntity::getTenantId, dataBoardDTO.getTenantId()));
                   .eq(TkDataBoardEntity::getTenantId, dataBoardDTO.getTenantId()));
+      if(!byDeleteDataComponent){
+        dataBoard.setLayout(board.getLayout());
+      }
       Optional.ofNullable(board)
       Optional.ofNullable(board)
           .map(obj -> {
           .map(obj -> {
             dataBoard.setAccessCredentials(obj.getAccessCredentials());
             dataBoard.setAccessCredentials(obj.getAccessCredentials());

@@ -21,8 +21,9 @@ public interface TkDataBoardService {
    * 修改或保存数据看板
    * 修改或保存数据看板
    *
    *
    * @param dataBoardDTO 数据看板信息
    * @param dataBoardDTO 数据看板信息
+   * @param byDeleteDataComponent  true是 false否
    */
    */
-  DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO);
+  DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO,boolean byDeleteDataComponent);
 
 
   /**
   /**
    * 删除数据看板
    * 删除数据看板