Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-15 5e48a47112f36ae5f6b3f4fc0271d0649a31372a

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

@@ -122,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(