目录方法名及注释修改，物理书架修改新增、删除接口

dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java

@@ -58,7 +58,7 @@ public class DaCatalogController extends BaseController
         //查询全部目录列表
         List<DaCatalog> catalogs = daCatalogService.selectDaCatalogList(new DaCatalog());
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", daCatalogService.selectCatalogListByUserId(userId));
+        ajax.put("checkedKeys", daCatalogService.selectCatalogIdsByUserId(userId));
         ajax.put("catalogs", daCatalogService.buildCatalogTreeSelect(catalogs));
         return ajax;
     }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java

@@ -65,5 +65,5 @@ public interface DaCatalogMapper
 
     List<DaCatalog> selectDaCatalogListByUserId(DaCatalog daCatalog);
 
-    List<Long> selectCatalogListByUserId(Long userId);
+    List<Long> selectCatalogIdsByUserId(Long userId);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java

@@ -88,7 +88,7 @@ public interface IDaCatalogService
      */
     List<TreeSelect> buildCatalogTreeSelect(List<DaCatalog> catalogs);
 
-    List<Long> selectCatalogListByUserId(Long userId);
+    List<Long> selectCatalogIdsByUserId(Long userId);
 
 
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java

@@ -43,8 +43,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService
     }
 
     @Override
-    public List<Long> selectCatalogListByUserId(Long userId) {
+    public List<Long> selectCatalogIdsByUserId(Long userId) {
-        return daCatalogMapper.selectCatalogListByUserId(userId);
+        return daCatalogMapper.selectCatalogIdsByUserId(userId);
     }
 
     @Override

dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
         </where>
+        order by pid, order_num
     </select>
     
     <select id="selectDaBookshelfByShelfId" parameterType="Long" resultMap="DaBookshelfResult">

dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml

@@ -58,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by c.pid, c.order_num
     </select>
-
+    <!--查村用户所包含权限的id的集合-->
-    <select id="selectCatalogListByUserId" resultType="Long">
+    <select id="selectCatalogIdsByUserId" resultType="Long">
 		select c.id
 		from da_catalog c
              left join da_user_catalog uc on c.id = uc.mu_id