Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 9330e9b0e4e70151d36084ecb5695b818cfda2db

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

@@ -83,6 +83,12 @@
        String json = JSON.toJSONString(taskSchedules, SerializerFeature.WriteMapNullValue);
//         String json = new Gson().toJson(taskSchedules);
        ledScheduleEntity.setSchedule(json);
        if (SecurityUtils.getClientId() != null) {
            ledScheduleEntity.setUserId(SecurityUtils.getUserId());
            if (clientService.findClientId()) {
                ledScheduleEntity.setClientId(clientService.getClientId());
            }
        }
        return this.save(ledScheduleEntity);
    }

@@ -152,7 +158,7 @@
            });
        }
        //模糊查询关键字判断
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            eq = eq.like(LedScheduleEntity::getName, keyword);
        }