Merge branch 'master' into patch-1

TommyLemon · web-flow · commit 54734a18c0ea · 2023-09-24T23:07:10.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -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) {
@@ -6020,4 +6020,4 @@ public AbstractSQLConfig setWithAsExprPreparedValueList(List<Object> list) {
 		this.withAsExprPreparedValueList = list;
 		return this;
 	}
-}
+}
diff --git a/README.md b/README.md
@@ -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)
@@ -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)
 
 ### 贡献者们
