|
|
@@ -23,7 +23,6 @@ import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
|
import cn.iocoder.yudao.module.system.service.dept.PostService;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
-import io.swagger.v3.oas.annotations.Parameters;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
@@ -34,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -165,7 +165,9 @@ public class EmployeeInfoController {
|
|
|
// 拼接数据
|
|
|
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
|
|
|
convertList(pageResult.getList(), EmployeeInfoDO::getDeptId));
|
|
|
- return success(new PageResult<>(EmployeeConvert.INSTANCE.convertList(pageResult.getList(), deptMap, null),
|
|
|
+ // 避免空指针报错
|
|
|
+ Map<Long, PostDO> postMap = new HashMap<>();
|
|
|
+ return success(new PageResult<>(EmployeeConvert.INSTANCE.convertList(pageResult.getList(), deptMap, postMap),
|
|
|
pageResult.getTotal()));
|
|
|
}
|
|
|
|