From 3481b78afafe5ff83d68a4f58741b7c15efcaeb1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 15:20:13 +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..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
@@ -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