Commit 05d1ad5f1305922b4647cd1d6f53599c6ddbff90
1 parent
4d049538
feat: fix data board layout NullPointException
Showing
2 changed files
with
1 additions
and
2 deletions
... | ... | @@ -17,7 +17,6 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; |
17 | 17 | import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO; |
18 | 18 | import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO; |
19 | 19 | import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; |
20 | -import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO; | |
21 | 20 | import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO; |
22 | 21 | import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; |
23 | 22 | import org.thingsboard.server.controller.BaseController; | ... | ... |
... | ... | @@ -112,7 +112,7 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper, |
112 | 112 | obj -> { |
113 | 113 | DataBoardDTO returnBoard = obj.getDTO(DataBoardDTO.class); |
114 | 114 | List<ComponentLayoutDTO> layout = new ArrayList<>(); |
115 | - if (obj.getLayout().isArray()) { | |
115 | + if (obj.getLayout() != null && obj.getLayout().isArray()) { | |
116 | 116 | for (JsonNode jsonNode : obj.getLayout()) { |
117 | 117 | layout.add(JacksonUtil.convertValue(jsonNode, ComponentLayoutDTO.class)); |
118 | 118 | } | ... | ... |