From fe9e3a7e341f4979beb09d287a5ee761c660e728 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:54:19 +0800
Subject: [PATCH] screen-manage                 添加组织返回字段

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java |    2 +-
 1 files changed, 1 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 64c92b3..116d94e 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
@@ -87,7 +87,6 @@
         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());
@@ -108,6 +107,7 @@
             adminUserVO.setCreateTime(adminUserCreateTimeStr);
             adminUserVO.setUserName(adminUser.getUserName());
             adminUserVO.setOrganizationName(organization.getName());
+            vo.setAdminUserAccount(adminUser.getAccount());
             vo.setAdminUser(adminUserVO);
         }else{
             vo.setAdminUser(new UserVO());

--
Gitblit v1.8.0