@@ -177,7 +177,7 @@ public AbstractObjectParser parse() throws Exception {
177
177
functionMap = null ;//must init
178
178
childMap = null ;//must init
179
179
180
- Set <Entry <String , Object >> set = new LinkedHashSet <Entry <String , Object >>(request .entrySet ());
180
+ Set <Entry <String , Object >> set = request . isEmpty () ? null : new LinkedHashSet <Entry <String , Object >>(request .entrySet ());
181
181
if (set != null && set .isEmpty () == false ) {//判断换取少几个变量的初始化是否值得?
182
182
if (isTable ) {//非Table下必须保证原有顺序!否则 count,page 会丢, total@:"/[]/total" 会在[]:{}前执行!
183
183
customMap = new LinkedHashMap <String , Object >();
@@ -261,17 +261,17 @@ else if (method == PUT && value instanceof JSONArray
261
261
}
262
262
263
263
if (isTable ) {
264
- if (sqlRequest . get ( JSONRequest . KEY_DATABASE ) == null && parser . getGlobleDatabase () ! = null ) {
264
+ if (parser . getGlobleDatabase () != null && sqlRequest . get ( JSONRequest . KEY_DATABASE ) = = null ) {
265
265
sqlRequest .put (JSONRequest .KEY_DATABASE , parser .getGlobleDatabase ());
266
266
}
267
- if (sqlRequest . get ( JSONRequest . KEY_SCHEMA ) == null && parser . getGlobleSchema () ! = null ) {
267
+ if (parser . getGlobleSchema () != null && sqlRequest . get ( JSONRequest . KEY_SCHEMA ) = = null ) {
268
268
sqlRequest .put (JSONRequest .KEY_SCHEMA , parser .getGlobleSchema ());
269
269
}
270
270
if (isSubquery == false ) { //解决 SQL 语法报错,子查询不能 EXPLAIN
271
- if (sqlRequest . get ( JSONRequest . KEY_EXPLAIN ) == null && parser . getGlobleExplain () ! = null ) {
271
+ if (parser . getGlobleExplain () != null && sqlRequest . get ( JSONRequest . KEY_EXPLAIN ) = = null ) {
272
272
sqlRequest .put (JSONRequest .KEY_EXPLAIN , parser .getGlobleExplain ());
273
273
}
274
- if (sqlRequest . get ( JSONRequest . KEY_CACHE ) == null && parser . getGlobleCache () ! = null ) {
274
+ if (parser . getGlobleCache () != null && sqlRequest . get ( JSONRequest . KEY_CACHE ) = = null ) {
275
275
sqlRequest .put (JSONRequest .KEY_CACHE , parser .getGlobleCache ());
276
276
}
277
277
}
0 commit comments