解决目录树相关BUG

doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -131,7 +131,17 @@ public class DocDirController extends BaseController {
         TreeVO vo = new TreeVO();
         vo.setId(dir.getDirId());
         vo.setLabel(dir.getDirName());
+
         List<TreeVO> children = new ArrayList<>();
+
+        DocDir dir1 = new DocDir();
+        dir1.setParentId(dir.getDirId());
+        dir1.setSpaceId(dir.getSpaceId());
+
+        docDirService.selectDocDirList(dir1).forEach(d -> {
+            children.add(getChildren(d, st));
+        });
+
         if (!dirTree.equals(st)) {
             //如果不是目录树
             vo.setDisabled(true);
@@ -149,11 +159,6 @@ public class DocDirController extends BaseController {
             });
         }
 
-        DocDir dir1 = new DocDir();
-        dir1.setParentId(dir.getDirId());
-        docDirService.selectDocDirList(dir1).forEach(d -> {
-            children.add(getChildren(d, st));
-        });
 
         vo.setChildren(children);
         return vo;

doc-biz/src/main/resources/mapper/biz/DocInfoMapper.xml

@@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDocInfoList" parameterType="DocInfo" resultMap="DocInfoResult">
         <include refid="selectDocInfoVo"/>
         <where>
+            <if test="dirId != null  and dirId != ''"> and DIR_ID like concat('%', #{dirId}, '%')</if>
+            <if test="spaceId != null  and spaceId != ''"> and SPACE_ID like concat('%', #{spaceId}, '%')</if>
             <if test="fileName != null  and fileName != ''"> and FILE_NAME like concat('%', #{fileName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and CREATE_TIME between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="params.dirIds!=null">
@@ -35,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by FILE_NAME
     </select>
     
     <select id="selectDocInfoByDocId" parameterType="Long" resultMap="DocInfoResult">