|
|
@@ -5,8 +5,9 @@ import com.zhongshu.card.client.model.base.SuperModel;
|
|
|
import com.zhongshu.card.client.model.org.DepartmentModel;
|
|
|
import com.zhongshu.card.client.model.org.OrganizationUserModel;
|
|
|
import com.zhongshu.card.client.model.org.UserCountModel;
|
|
|
+import com.zhongshu.card.client.model.org.UserCountSimpleModel;
|
|
|
import com.zhongshu.card.client.model.org.role.RoleModel;
|
|
|
-import com.zhongshu.card.client.model.school.AreaModel;
|
|
|
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
|
|
|
import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
|
|
|
import com.zhongshu.card.client.type.UserState;
|
|
|
import io.swagger.v3.oas.annotations.media.Schema;
|
|
|
@@ -50,9 +51,9 @@ public class DevicePermissModel extends SuperModel {
|
|
|
}
|
|
|
|
|
|
@Schema(description = "区域信息")
|
|
|
- private AreaModel area;
|
|
|
+ private AreaSimpleModel area;
|
|
|
|
|
|
- public AreaModel getArea() {
|
|
|
+ public AreaSimpleModel getArea() {
|
|
|
if (ObjectUtils.isNotEmpty(deviceInfo)) {
|
|
|
return deviceInfo.getArea();
|
|
|
}
|
|
|
@@ -63,9 +64,9 @@ public class DevicePermissModel extends SuperModel {
|
|
|
private String areaPaths = "";
|
|
|
|
|
|
@Schema(description = "可使用的用户信息")
|
|
|
- private UserCountModel userAccount;
|
|
|
+ private UserCountSimpleModel userAccount;
|
|
|
|
|
|
- public UserCountModel getUserAccount() {
|
|
|
+ public UserCountSimpleModel getUserAccount() {
|
|
|
if (organizationUser != null) {
|
|
|
return organizationUser.getUser();
|
|
|
}
|