screen-manage 修改前台用户模块

kaiyu

2021-05-10 275f338495f3e694ccf6fa909fb78b949a67921c

 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java

@@ -2,8 +2,10 @@

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
import com.moral.api.pojo.vo.user.UserVO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import lombok.Data;
@@ -72,8 +74,7 @@
        Date expireTime = organization.getExpireTime();
        String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
        String exipreTimeStr = DateUtils.dateToDateString(expireTime, "yyyy-MM-dd");


        //封装组织信息
        vo.setId(organization.getId());
        vo.setName(organization.getName());
        if (!ObjectUtils.isEmpty(parentOrganization))
@@ -84,12 +85,32 @@
        vo.setAddress(organization.getAddress());
        vo.setCreateTime(createTimeStr);
        vo.setExpireTime(exipreTimeStr);
        vo.setAdminUserId(organization.getAdminUserId());
        vo.setProvinceCode(organization.getProvinceCode());
        vo.setCityCode(organization.getCityCode());
        vo.setAreaCode(organization.getAreaCode());
        vo.setProvinceCityAreaName(organization.getProvinceName()+"/"+organization.getCityName()+"/"+organization.getAreaName());
        vo.setProvinceCityAreaName(organization.getProvinceName() + "/" + organization.getCityName() + "/" + organization.getAreaName());
        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");
            String adminUserExpireTimeStr = DateUtils.dateToDateString(adminUser.getExpireTime(), "yyyy-MM-dd");
            adminUserVO.setId(adminUser.getId());
            adminUserVO.setMobile(adminUser.getMobile());
            adminUserVO.setEmail(adminUser.getEmail());
            adminUserVO.setWechat(adminUser.getWechat());
            adminUserVO.setAccount(adminUser.getAccount());
            adminUserVO.setExpireTime(adminUserExpireTimeStr);
            adminUserVO.setCreateTime(adminUserCreateTimeStr);
            adminUserVO.setUserName(adminUser.getUserName());
            adminUserVO.setOrganizationName(organization.getName());
            vo.setAdminUser(adminUserVO);
        }else{
            vo.setAdminUser(new UserVO());
        }
        return vo;
    }
}