lixing 4 năm trước cách đây
mục cha
commit
9d3fa91b6e

+ 10 - 8
fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java

@@ -23,6 +23,7 @@ import com.persagy.fm.translate.model.Trans;
 import com.persagy.fm.translate.model.TransType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
@@ -158,6 +159,7 @@ public class DepartmentController {
     public CommonResult<PageList<ProjectTreeItemVO>> queryDepProjectTree(
             @Valid @RequestBody QueryDepProjectTreeDTO queryDepProjectTreeDTO) {
         List<ProjectTreeItemVO> projectTreeItemVOList = depProjectService.queryDepProjectTree(queryDepProjectTreeDTO.getParentDepId());
+        projectTreeItemVOList = projectTreeItemVOList == null ? Lists.newArrayList() : projectTreeItemVOList;
         return ResultHelper.multi(projectTreeItemVOList);
     }
 
@@ -169,13 +171,13 @@ public class DepartmentController {
         return ResultHelper.success();
     }
 
-//    @Autowired
-//    CreateDbService createDbService;
-//
-//    @PostMapping("/createDb")
-//    public CommonResult test() {
-//        createDbService.createDb("test");
-//        return ResultHelper.success();
-//    }
+    //    @Autowired
+    //    CreateDbService createDbService;
+    //
+    //    @PostMapping("/createDb")
+    //    public CommonResult test() {
+    //        createDbService.createDb("test");
+    //        return ResultHelper.success();
+    //    }
 }