Commit 5b9caf00 authored by cq990612's avatar cq990612

优化代码结构

parent 94ba229f
......@@ -18,4 +18,6 @@ public class ProjectsDto {
private List<WorkType> workTypes;
private List<WorkType> workTypeList;
}
......@@ -544,6 +544,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
ProjectsDto projectsDto = new ProjectsDto();
WorkUser user = workUserService.getById(userId);
// 逻辑删后的东西
List<WorkType> workTypeList = workTypeService.getByIsDelete(1, 0);
projectsDto.setWorkTypeList(workTypeList);
// 1.获取可填报的类型
List<WorkType> workTypes = workTypeService.getAll(1);
if (!CollectionUtils.isEmpty(workTypes)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment