Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(关系): 优化固定值的判断 #313

Merged
merged 8 commits into from
Jun 6, 2023
Merged

fix(关系): 优化固定值的判断 #313

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e5b898
fix(阿里云短信): 解决短信模板和标签只能查询第一页数据问题 (#258)
bestfeng1020 Apr 7, 2023
b7dffda
feat(查询条件): 添加设备查询条件构造器 (#260)
bestfeng1020 Apr 7, 2023
8e9878e
feat(仪表盘): 系统监控添加历史记录支持
kyouji May 16, 2023
535aaf7
Merge branch '2.0' of github.com:jetlinks/jetlinks-community
kyouji Jun 6, 2023
f4508cd
fix(关系): 优化固定值的判断
kyouji Jun 6, 2023
b6f04e0
fix(关系): 优化固定值的判断
kyouji Jun 6, 2023
23e342e
Merge branch 'master' of github.com:kyouji/jetlinks-community
kyouji Jun 6, 2023
a80acce
fix(通知): 还原版本
kyouji Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...elation-component/src/main/java/org/jetlinks/community/relation/utils/VariableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public Flux<Object> resolve(Map<String, Object> context,
ConfigKey<?> propertyPath) {
validate();
if (getSource() == VariableSource.Source.fixed) {
return CastUtils.flatStream(Flux.just(value));
return value == null ? Flux.empty() : CastUtils.flatStream(Flux.just(value));
}
if (getSource() == VariableSource.Source.upper) {
return Mono
Expand Down