diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java index 61ab70b..d894ee9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java @@ -58,7 +58,7 @@ public class DaCatalogController extends BaseController //查询全部目录列表 List 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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java index f3d1d3c..b7cab56 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java @@ -65,5 +65,5 @@ public interface DaCatalogMapper List selectDaCatalogListByUserId(DaCatalog daCatalog); - List selectCatalogListByUserId(Long userId); + List selectCatalogIdsByUserId(Long userId); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java index d3e0a89..6281b6b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java @@ -88,7 +88,7 @@ public interface IDaCatalogService */ List buildCatalogTreeSelect(List catalogs); - List selectCatalogListByUserId(Long userId); + List selectCatalogIdsByUserId(Long userId); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java index a9d9234..d4bf168 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java @@ -43,8 +43,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService } @Override - public List selectCatalogListByUserId(Long userId) { - return daCatalogMapper.selectCatalogListByUserId(userId); + public List selectCatalogIdsByUserId(Long userId) { + return daCatalogMapper.selectCatalogIdsByUserId(userId); } @Override diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml index 4ff7100..8ea17a1 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ancestors = #{ancestors} and order_num = #{orderNum} + order by pid, order_num - - select c.id from da_catalog c left join da_user_catalog uc on c.id = uc.mu_id