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