screen-manage 添加组织返回字段

kaiyu

2021-05-10 d254385484b2baf2b4c76388e93bb850c9a6e2b3

 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");