Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java

@@ -151,6 +151,15 @@ public class PermissionServiceImpl implements PermissionService {
                     .in(RolePermission::getRoleId, roleIds);
             long count = rolePermissionMapper.selectCount(queryWrapper);
             map.put(id, count>0);
+
+            // 添加父节点
+            if ( count>0 ) {
+                EdFileInfo file = edFileInfoMapper.selectById(id);
+                String[] parentIds = file.getFilePath().split("_");
+                for (String parentId : parentIds) {
+                    map.put(parentId, true);
+                }
+            }
         }
         return map;
     }