From 5ee0324cdba7611f3ca12f7b53aac631ff4a770c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 10 Nov 2023 17:20:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=2078402=20=E6=A0=87=E7=AD=BE=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E7=AE=A1=E7=90=86--=E5=AD=97=E5=85=B8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE--=E6=96=B0=E5=BB=BA=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDictItemController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index b136c5a4..04554279 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -134,12 +134,15 @@ public class SysDictItemController { tree.setWeight(treeNode.getSortOrder()); tree.setName(treeNode.getItemText()); // 扩展属性 ... - Map map = BeanUtil.beanToMap(treeNode,"dictId","parentId","itemText","itemValue","enName","description","sortOrder","status"); + Map map = BeanUtil.beanToMap(treeNode,"dictId","parentId","itemText","itemValue","enName","description","sortOrder","status","isReadOnly"); for (String s : map.keySet()) { tree.putExtra(s, map.get(s)); } }); Page> treePage = new Page<>(pageNo, pageSize); + if (treeNodes == null){ + treeNodes = new ArrayList<>(); + } treePage.setRecords(treeNodes); treePage.setTotal(pageList.getTotal()); return Result.OK(treePage);