|
@@ -128,13 +128,17 @@ public class OaStampInfoController {
|
|
|
// 创建人名字
|
|
|
Long createEmployeeId = oaStampInfoRespVO.getCreateEmployeeId();
|
|
|
EmployeeRespDTO createEmployee = employeeApi.getEmployeeById(createEmployeeId);
|
|
|
- oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getName());
|
|
|
+ if (createEmployee != null) {
|
|
|
+ oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getName());
|
|
|
+ }
|
|
|
// 用印人信息
|
|
|
Long employeeId = oaStampInfoRespVO.getEmployeeId();
|
|
|
// AdminUserRespDTO employee = adminUserApi.getUser(employeeId);
|
|
|
EmployeeRespDTO employee = employeeApi.getEmployeeById(employeeId);
|
|
|
- oaStampInfoRespVO.setEmployeeName(employee.getName());
|
|
|
- oaStampInfoRespVO.setEmployeePhone(employee.getPhone());
|
|
|
+ if (employee != null) {
|
|
|
+ oaStampInfoRespVO.setEmployeeName(employee.getName());
|
|
|
+ oaStampInfoRespVO.setEmployeePhone(employee.getPhone());
|
|
|
+ }
|
|
|
// 职位
|
|
|
Long postId = oaStampInfoRespVO.getPostId();
|
|
|
PostRespDTO post = postApi.getPost(postId);
|
|
@@ -144,7 +148,9 @@ public class OaStampInfoController {
|
|
|
// 部门名称
|
|
|
Long deptId = oaStampInfoRespVO.getDeptId();
|
|
|
DeptRespDTO dept = deptApi.getDept(deptId);
|
|
|
- oaStampInfoRespVO.setDeptName(dept.getName());
|
|
|
+ if (dept != null) {
|
|
|
+ oaStampInfoRespVO.setDeptName(dept.getName());
|
|
|
+ }
|
|
|
|
|
|
// 附件
|
|
|
List<FileDTO> fileDTOListByBiz = fileApi.getFileDTOListByBiz(oaStampInfo.getStampUuid());
|