blame | history | patch | commit | commitdiff | ignore whitespace
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;


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