Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

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