From 2cf0253cf25e8e74958075eb3d1a1b8eac70356d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 08:50:19 +0800
Subject: [PATCH] 去除员工管理菜单。角色分配唯一
---
screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java | 6 +++---
1 files changed, 3 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 64c92b3..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;
@@ -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