2021与蓝度共同重构项目,服务端
fix
zhanzhiqin
2022-04-15 c9586d61be8ae3411c6428a2cc2588c11f97db2c
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -91,6 +91,8 @@
        if (pole == null) {
            throw new BusinessException("未找到该灯杆");
        }
        // 删除灯杆绑定关系
        poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
        return removeById(poleId);
    }
@@ -120,7 +122,10 @@
        if (SecurityUtils.getClientId() == null) {
            wrapper = Wrappers.lambdaQuery(Pole.class);
        } else {
            wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
            wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
                    w -> {
                        w.eq(Pole::getUserId, SecurityUtils.getUserId());
                    });
        }
        if (!param.getKeyword().isEmpty()) {
            wrapper.like(Pole::getPoleCode, param.getKeyword()).or(