feat: fix data board layout NullPointException

黄 x
1 parent 4d049538
Showing 2 changed files with 1 additions and 2 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDataBoardServiceImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
View file @05d1ad5
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
View file @05d1ad5
@@ -17,7 +17,6 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDataBoardServiceImpl.java
View file @05d1ad5
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDataBoardServiceImpl.java
View file @05d1ad5
@@ -112,7 +112,7 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
             obj -> {
               DataBoardDTO returnBoard = obj.getDTO(DataBoardDTO.class);
               List<ComponentLayoutDTO> layout = new ArrayList<>();
-              if (obj.getLayout().isArray()) {
+              if (obj.getLayout() != null && obj.getLayout().isArray()) {
                 for (JsonNode jsonNode : obj.getLayout()) {
                   layout.add(JacksonUtil.convertValue(jsonNode, ComponentLayoutDTO.class));
                 }