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

kaiyu

2021-04-16 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b

 screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java

@@ -1,16 +1,14 @@
package com.moral.api.pojo.form.account;

import com.moral.api.entity.ManageAccount;
import com.moral.api.pojo.dto.account.AccountInsertDTO;
import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;

import java.io.Serializable;
import java.util.List;

/**
@@ -41,29 +39,20 @@

    private String wechat;


    private String createTime;


    private String updateTime;


    private List<String> roleIds;

    public boolean valid() {
        if (
                ObjectUtils.isEmpty(account)  ||
                ObjectUtils.isEmpty(password) ||
                ObjectUtils.isEmpty(email)    ||
                ObjectUtils.isEmpty(mobile)   ||
                ObjectUtils.isEmpty(userName)
            )
            return false;
        return true;
    }

    public AccountInsertDTO paramValid(){
        AccountInsertDTO dto = new AccountInsertDTO();
    public AccountDTO paramValid(){
        AccountDTO dto = new AccountDTO();
        //判断用户名是否符合条件
        if(!RegexUtils.checkAccount(account)){
            dto.setCode(ResponseCodeEnum.ACCOUNT_INVALID.getCode());