|
|
@@ -13,9 +13,9 @@ import com.google.common.collect.Lists;
|
|
|
import com.zhongshu.card.client.model.base.AuthTypeParam;
|
|
|
import com.zhongshu.card.client.model.base.UserIdModel;
|
|
|
import com.zhongshu.card.client.model.org.*;
|
|
|
-import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
|
|
|
import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
|
|
|
import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
|
|
|
+import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
|
|
|
import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
|
|
|
import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
|
|
|
import com.zhongshu.card.client.service.org.UserAccountService;
|
|
|
@@ -739,9 +739,9 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
|
|
|
// 部门信息
|
|
|
if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
|
|
|
- DepartmentSimpleModel departmentModel = departmentService.toModel(entity.getDepartment());
|
|
|
+ DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
|
|
|
model.setDepartment(departmentModel);
|
|
|
- List<DepartmentSimpleModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
+ List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
model.setDepartments(departmentModels);
|
|
|
}
|
|
|
}
|
|
|
@@ -783,7 +783,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
|
|
|
// 部门信息
|
|
|
if (ObjectUtils.isNotEmpty(entity.getDepartment())) {
|
|
|
- DepartmentModel departmentModel = departmentService.toModel(entity.getDepartment());
|
|
|
+ DepartmentSimpleModel departmentModel = departmentService.toSimpleModel(entity.getDepartment());
|
|
|
model.setDepartment(departmentModel);
|
|
|
List<DepartmentModel> departmentModels = departmentService.getParents(entity.getDepartment().getId());
|
|
|
model.setDepartments(departmentModels);
|