用户新增密码字段fix

zhanzhiqin

2022-03-08 b123947a669813c5aaa7fed431e1065f70edf09f

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java

@@ -5,6 +5,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
@@ -23,26 +24,26 @@
    private final PasswordEncoder passwordEncoder;


    public boolean addClient(ClientPrarm clientPrarm) {
    public boolean addClient(AddClientPrarm addClientPrarm) {

        if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
        if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
            throw new BusinessException("该用户名已存在！");
        }

        Client client = new Client();
        if (clientPrarm.getClientSuperior() != null && !"".equals(clientPrarm.getClientSuperior())) {
            Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
        if (addClientPrarm.getClientSuperior() != null && !"".equals(addClientPrarm.getClientSuperior())) {
            Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientSuperior()));
            if (one != null) {
                client.setSuperiorId(one.getId());
            } else {
                throw new BusinessException("上级客户不存在");
            }
        }
        client.setClientName(clientPrarm.getClientName());
        client.setLinkMan(clientPrarm.getLinkMan());
        client.setMobile(clientPrarm.getMobile());
        client.setClientSuperior(clientPrarm.getClientSuperior());
        client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
        client.setClientName(addClientPrarm.getClientName());
        client.setLinkMan(addClientPrarm.getLinkMan());
        client.setMobile(addClientPrarm.getMobile());
        client.setClientSuperior(addClientPrarm.getClientSuperior());
        client.setPassword(passwordEncoder.encode(addClientPrarm.getPassword()));


        return save(client);
@@ -57,18 +58,20 @@
        }

        //判断用户名是否重复
        if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
        Client client1 = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim()));
        if (client1 != null && !client1.getId().equals(one.getId())) {
            throw new BusinessException("该用户名已存在！");
        }
        //判断上级用户是否存在
        Client client = new Client();
        if (clientPrarm.getClientSuperior() != null) {
        if (clientPrarm.getClientSuperior() != null && clientPrarm.getClientSuperior().trim().length() != 0) {
            Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
            if (superior != null) {
                if (superior.getId().equals(one.getId())) {
                    throw new BusinessException("上级客户为本账户！");
                } else {
                    client.setSuperiorId(superior.getId());
                    client.setClientSuperior(clientPrarm.getClientSuperior());
                }
            } else {
                throw new BusinessException("上级客户不存在");
@@ -78,8 +81,6 @@
        client.setClientName(clientPrarm.getClientName());
        client.setLinkMan(clientPrarm.getLinkMan());
        client.setMobile(clientPrarm.getMobile());
        client.setClientSuperior(clientPrarm.getClientSuperior());
        client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));

        // update(client);
        return updateById(client);