wangys 6 years ago
parent
commit
f091de0102

+ 1 - 1
efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/DepartmentRepository.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 
 public interface DepartmentRepository extends BasicRepository<Department> {
 public interface DepartmentRepository extends BasicRepository<Department> {
 
 
-    List<Department> findByPathOrderBySortDesc(Long path);
+    List<Department> findByPathOrderBySortAsc(Long path);
 
 
     List<Department> findByStatusOrderBySortDesc(BaseStatusEnum status);
     List<Department> findByStatusOrderBySortDesc(BaseStatusEnum status);
 
 

+ 2 - 2
efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/DepartmentServiceImpl.java

@@ -106,7 +106,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         DeptTreeVO node = new DeptTreeVO();
         DeptTreeVO node = new DeptTreeVO();
         node.setLabel(department.getName());
         node.setLabel(department.getName());
         node.setId(department.getId());
         node.setId(department.getId());
-        List<Department> childTreeNodes = departmentRepository.findByPathOrderBySortDesc(cid);
+        List<Department> childTreeNodes = departmentRepository.findByPathOrderBySortAsc(cid);
         for(Department child : childTreeNodes){
         for(Department child : childTreeNodes){
             DeptTreeVO n = recursiveTree(child.getId()); //递归
             DeptTreeVO n = recursiveTree(child.getId()); //递归
             node.getChildren().add(n);
             node.getChildren().add(n);
@@ -115,7 +115,7 @@ public class DepartmentServiceImpl implements DepartmentService {
     }
     }
 
 
     private List<Department> deptChild(Long cid, List<Department> departments) {
     private List<Department> deptChild(Long cid, List<Department> departments) {
-        List<Department> childTreeNodes = departmentRepository.findByPathOrderBySortDesc(cid);
+        List<Department> childTreeNodes = departmentRepository.findByPathOrderBySortAsc(cid);
         departments.addAll(childTreeNodes);
         departments.addAll(childTreeNodes);
         for(Department child : childTreeNodes){
         for(Department child : childTreeNodes){
             deptChild(child.getId(), departments); //递归
             deptChild(child.getId(), departments); //递归