From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..ae181e6 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
@@ -40,7 +40,7 @@
         if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
             return null;
         OrganizationQueryVO vo = new OrganizationQueryVO();
-        long page = dto.getPage();
+        long pages = dto.getPages();
         long total = dto.getTotal();
         long current = dto.getCurrent();
         long size = dto.getSize();
@@ -53,7 +53,7 @@
 
         vo.setCurrent(current);
         vo.setOrganizations(organizationVOS);
-        vo.setPages(page);
+        vo.setPages(pages);
         vo.setSize(size);
         vo.setTotal(total);
         return vo;
@@ -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");
@@ -93,7 +94,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");
@@ -107,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