lyhzzz пре 2 година
родитељ
комит
59c1ade11b

+ 13 - 1
src/main/java/com/cdf/controller/back/SysDeptController.java

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.xml.transform.Result;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -96,7 +98,17 @@ public class SysDeptController extends BaseLogController{
     public ResultData list(){
         Integer id = JwtUtil.getId(getToken());
         User user = userService.getById(id);
-        return ResultData.ok(deptService.getDeptList(null));
+        if(user == null){
+            return ResultData.ok(new ArrayList<>());
+        }
+        Dept dept = deptService.getById(user.getDeptId());
+        if(dept == null){
+            return ResultData.ok(new ArrayList<>());
+        }
+        DeptVo vo = new DeptVo();
+        BeanUtils.copyProperties(dept,vo);
+        vo.setChildren(deptService.getDeptList(user.getDeptId()));
+        return ResultData.ok(Arrays.asList(vo));
     }
 
 

+ 2 - 1
src/main/java/com/cdf/service/IDeptService.java

@@ -2,6 +2,7 @@ package com.cdf.service;
 
 import com.cdf.entity.Dept;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cdf.response.DeptVo;
 
 import java.util.List;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface IDeptService extends IService<Dept> {
 
-    Object getDeptList(Integer parentId);
+    List<DeptVo> getDeptList(Integer parentId);
 
     List<Dept> getDeptSonList(Integer deptId);