Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/common/utils/TreeUtil.java

@@ -26,8 +26,6 @@ public class TreeUtil {
     public static <T extends ITreeNode<T,V>,V> List<T> build(List<T> items) {
 
         List<String> notParents = new ArrayList<>();
-        System.out.println("构建树结构");
-        long startTime = System.currentTimeMillis();
 
         items.forEach((node) -> {
             V parentId = node.getParentId();
@@ -54,8 +52,6 @@ public class TreeUtil {
             }
 
         });
-        long endTime = System.currentTimeMillis();
-        System.out.printf("构建树结构:%d \n",(endTime - startTime));
 
         return items.stream().filter(x -> StrUtil.isEmptyIfStr(x.getParentId()) || StrUtil.equals(String.valueOf(x.getParentId()), String.valueOf(GlobalConstant.FIRST_NODE_VALUE)) || notParents.contains(x.getId().toString())).collect(Collectors.toList());
     }

src/main/java/com/xjrsoft/module/system/service/impl/AuthorizeServiceImpl.java

@@ -163,24 +163,26 @@ public class AuthorizeServiceImpl extends ServiceImpl<AuthorizeMapper, Authorize
             vo.setButtonAuthCode(buttonList.stream().filter(x -> x.getMenuId().equals(menu.getId())).map(MenuButton::getCode).collect(Collectors.toSet()));
             vo.setColumnAuthCode(columnList.stream().filter(x -> x.getMenuId().equals(menu.getId())).map(MenuColumn::getCode).collect(Collectors.toSet()));
             // 处理表单字段，可能存在子表的情况
-            Set<Object> formAuthCodeList = new LinkedHashSet<>(formTreeVoList.size());
-            for (MenuFormTreeVo treeVo : formTreeVoList) {
-                if (treeVo.getMenuId().equals(menu.getId())) {
-                    List<MenuFormTreeVo> children = treeVo.getChildren();
-                    if (CollectionUtils.isNotEmpty(children)) {
-                        Set<String> subCodeList = new LinkedHashSet<>(children.size());
-                        for (MenuFormTreeVo child : children) {
-                            subCodeList.add(child.getCode());
+            if (formTreeVoList != null){
+                Set<Object> formAuthCodeList = new LinkedHashSet<>(formTreeVoList.size());
+                for (MenuFormTreeVo treeVo : formTreeVoList) {
+                    if (treeVo.getMenuId().equals(menu.getId())) {
+                        List<MenuFormTreeVo> children = treeVo.getChildren();
+                        if (CollectionUtils.isNotEmpty(children)) {
+                            Set<String> subCodeList = new LinkedHashSet<>(children.size());
+                            for (MenuFormTreeVo child : children) {
+                                subCodeList.add(child.getCode());
+                            }
+                            Map<String, Set<String>> subTableCodeMap = new HashMap<>(1);
+                            subTableCodeMap.put(treeVo.getCode(), subCodeList);
+                            formAuthCodeList.add(subTableCodeMap);
+                        } else {
+                            formAuthCodeList.add(treeVo.getCode());
                         }
-                        Map<String, Set<String>> subTableCodeMap = new HashMap<>(1);
-                        subTableCodeMap.put(treeVo.getCode(), subCodeList);
-                        formAuthCodeList.add(subTableCodeMap);
-                    } else {
-                        formAuthCodeList.add(treeVo.getCode());
                     }
                 }
+                vo.setFormAuthCode(formAuthCodeList);
             }
-            vo.setFormAuthCode(formAuthCodeList);
             authVoList.add(vo);
         }