|
|
@@ -768,7 +768,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
|
|
|
DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
|
|
|
model.setDepartment(departmentModel);
|
|
|
- List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
+
|
|
|
+ List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
model.setDepartments(departmentModels);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(entity.getReViewUserId())) {
|
|
|
@@ -815,7 +816,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
|
|
|
DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
|
|
|
model.setDepartment(departmentModel);
|
|
|
- List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
+
|
|
|
+ List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
model.setDepartments(departmentModels);
|
|
|
}
|
|
|
}
|