changes

liuhaonan

2022-09-09 6d9a70bde328683464b594e01444355b98db7713

changes

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

@@ -20,10 +20,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.ClientMapper;
@@ -256,6 +253,13 @@
        if (removeById(id)) {
            //删角色关系表信息
            flag = clientRoleRelationService.removeById(one);
            List<Pole> poles = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, id));
            poles.forEach(
                    pole -> {
                        pole.setClientId(-1L);
                    }
            );
            flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles);
            //删除失败回滚数据
            if (!flag) {
                throw new BusinessException("删除用户失败！");

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

@@ -717,7 +717,7 @@
                throw new BusinessException("灯杆不存在");
            }
            pole.setClientId(clientId);
            if (!clientService.findClientId(clientId)) {
            if (clientService.findClientId(clientId)) {
                pole.setUserId(clientService.getClientId(clientId));

            }
@@ -745,7 +745,6 @@
            if (pole == null) {
                throw new BusinessException("灯杆不存在");
            }
            pole.setUserId(-1L);
            pole.setClientId(-1L);
            r = updateById(pole);