Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyLemon authored Sep 24, 2023
2 parents 4147404 + 8e99f35 commit 54734a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -5255,7 +5255,7 @@ else if (userId instanceof Subquery) {}
Object deletedKey = accessFakeDeleteMap == null ? null : accessFakeDeleteMap.get(KEY_DELETED_KEY);
boolean hasKey = deletedKey instanceof String && StringUtil.isNotEmpty(deletedKey, true);
Object deletedValue = hasKey ? accessFakeDeleteMap.get(KEY_DELETED_VALUE) : null;
boolean containNotDeletedValue = hasKey ? accessFakeDeleteMap.containsKey(KEY_NOT_DELETED_VALUE) : null;
boolean containNotDeletedValue = hasKey ? accessFakeDeleteMap.containsKey(KEY_NOT_DELETED_VALUE) : false;
Object notDeletedValue = containNotDeletedValue ? accessFakeDeleteMap.get(KEY_NOT_DELETED_VALUE) : null;

if (deletedValue != null || containNotDeletedValue) {
Expand Down Expand Up @@ -6020,4 +6020,4 @@ public AbstractSQLConfig setWithAsExprPreparedValueList(List<Object> list) {
this.withAsExprPreparedValueList = list;
return this;
}
}
}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ https://github.com/Tencent/APIJSON/issues/187
<img src="https://github.com/Tencent/APIJSON/assets/5738175/9de7c199-4f29-44ed-9cb6-ad5e4fa44dfa" height="90">
<img src="https://github.com/Tencent/APIJSON/assets/5738175/d7155a65-22f7-49c6-8354-c309f36e4065" height="60">
<img src="https://github.com/Tencent/APIJSON/assets/5738175/f5a6ec8d-d9a8-49d0-a284-c50f1376647e" height="75">

<img src="https://gitee.com/linksame-ivan/APIJSON/blob/master/assets/logo-name.9f99700f.png" height="75">
<br />

* [腾讯科技有限公司](https://www.tencent.com)
Expand All @@ -349,6 +349,7 @@ https://github.com/Tencent/APIJSON/issues/187
* [乐拼科技](https://www.lepinyongche.com)
* [珠海采筑电子商务有限公司](https://www.aupup.com)
* [爱投斯智能技术(深圳)有限公司](http://www.aiotos.net)
* [邻盛科技(武汉)有限公司](http://www.linksame.com)
* [上海麦市信息科技有限公司](https://www.masscms.com)

### 贡献者们
Expand Down

0 comments on commit 54734a1

Please sign in to comment.