bugfix

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

@@ -3,6 +3,7 @@ package cn.efunbox.manage.base.repository;
 import cn.efunbox.manage.base.entity.Department;
 import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.common.data.BasicRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -13,4 +14,7 @@ public interface DepartmentRepository extends BasicRepository<Department> {
 
     List<Department> findByStatusOrderBySortDesc(BaseStatusEnum status);
 
+    @Query(value = "select * from department where status = 0 and id != 0 order by path, sort", nativeQuery = true)
+    List<Department> findSelect();
+
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/DepartmentService.java

@@ -16,4 +16,6 @@ public interface DepartmentService {
     ApiResult getDeptChild(Long deptId);
 
     ApiResult getDeptById(Long deptId);
+
+    ApiResult select();
 }

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

@@ -96,6 +96,11 @@ public class DepartmentServiceImpl implements DepartmentService {
         return ApiResult.ok(department);
     }
 
+    @Override
+    public ApiResult select() {
+        return ApiResult.ok(departmentRepository.findSelect());
+    }
+
     private DeptTreeVO recursiveTree(Long cid) {
         Department department = departmentRepository.find(cid);
         DeptTreeVO node = new DeptTreeVO();

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/DepartmentController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
  * Created by wangys on 2019/03/07
  */
 @RestController
-@RequestMapping("/dept")
+    @RequestMapping("/dept")
 public class DepartmentController {
 
     @Autowired
@@ -27,6 +27,11 @@ public class DepartmentController {
         return departmentService.getDeptChild(deptId);
     }
 
+    @GetMapping("/select")
+    public ApiResult select(){
+        return departmentService.select();
+    }
+
     @GetMapping("/{id}")
     public ApiResult findById(@PathVariable(name = "id") Long deptId){
         return departmentService.getDeptById(deptId);