Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 9330e9b0e4e70151d36084ecb5695b818cfda2db

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

@@ -246,8 +246,12 @@
     * @return
     */
    public List<Light> listLight() {
        Long clientId = SecurityUtils.getClientId();
        List<LightBo> listLight = baseMapper.listLight(clientId, null);
        List<LightBo> listLight;
        if (SecurityUtils.getClientId() != null) {
            listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
        } else {
            listLight = baseMapper.listLight(null, null);
        }
        List<Light> lightList = new ArrayList<>();
        for (LightBo bean : listLight) {
            Light light = getLight(bean.getDeviceCode());