chore:dev部分环境变化

cjl

2023-08-09 f80e452fa31bf48257d4897a937747f211c91790

 screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java

@@ -5,8 +5,11 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import lombok.Data;
import org.springframework.util.ObjectUtils;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -20,11 +23,11 @@
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AccountVO {

    private String code;

    private Integer id;

    private String userName;

    private String account;

    private String email;

@@ -32,22 +35,12 @@

    private String wechat;

    private List<ManageRole> roles;

    private List<String> roleNames;

    public static AccountVO convert(AccountDTO dto){
        if(dto.getAccount()==null)
            return null;
        AccountVO vo = new AccountVO();
        ManageAccount account = dto.getAccount();
        List<ManageRole> roles = dto.getRoles();
        List<String> roleNames = new ArrayList<>();
        roles.forEach(role->roleNames.add(role.getName()));
        vo.setId(account.getId());
        vo.setUserName(account.getUserName());
        vo.setEmail(account.getEmail());
        vo.setMobile(account.getMobile());
        vo.setWechat(account.getWechat());
        vo.setRoleNames(roleNames);
        return vo;
    }
    private String createTime;

    private String updateTime;

}