From d254385484b2baf2b4c76388e93bb850c9a6e2b3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:53:00 +0800
Subject: [PATCH] screen-manage 添加组织返回字段
---
screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
index be63279..64c92b3 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
@@ -70,6 +70,7 @@
OrganizationVO vo = new OrganizationVO();
Organization organization = dto.getOrganization();
Organization parentOrganization = dto.getParentOrganization();
+ User adminUser = dto.getAdminUser();
Date createTime = organization.getCreateTime();
Date expireTime = organization.getExpireTime();
String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
@@ -86,6 +87,7 @@
vo.setCreateTime(createTimeStr);
vo.setExpireTime(exipreTimeStr);
vo.setAdminUserId(organization.getAdminUserId());
+ vo.setAdminUserAccount(adminUser.getAccount());
vo.setProvinceCode(organization.getProvinceCode());
vo.setCityCode(organization.getCityCode());
vo.setAreaCode(organization.getAreaCode());
@@ -93,7 +95,6 @@
vo.setLocationLevelCode(organization.getLocationLevelCode());
vo.setLocationLevelName(organization.getLocationLevelName());
//������������admin������������
- User adminUser = dto.getAdminUser();
if (!ObjectUtils.isEmpty(adminUser)) {
UserVO adminUserVO = new UserVO();
String adminUserCreateTimeStr = DateUtils.dateToDateString(adminUser.getCreateTime(), "yyyy-MM-dd");
--
Gitblit v1.8.0