@@ -1186,12 +1186,8 @@ private String Operation_cg(String gridKey, JSONObject bson) {
1186
1186
String i = bson .get ("i" ).toString ();
1187
1187
String k = bson .get ("k" ).toString ();
1188
1188
1189
- JSONObject _v = null ; // Values to be replaced
1190
- if (bson .get ("v" ) != null ) {
1191
- _v = bson .getJSONObject ("v" );
1192
- }
1189
+ Object _v = bson .get ("v" );
1193
1190
if (_v == null ) {
1194
- //没有要修改的值
1195
1191
return "" ;
1196
1192
}
1197
1193
@@ -1202,19 +1198,21 @@ private String Operation_cg(String gridKey, JSONObject bson) {
1202
1198
//return "gridKey="+gridKey+"的数据表格不存在";
1203
1199
}
1204
1200
1205
-
1206
- //判断_v中是否存在null,则删除该参数
1201
+ // To determine whether there is null in _v, delete the parameter
1207
1202
boolean flag = false ;
1208
1203
String keys = "" ;
1209
- if (_v .keySet ().size () != 0 ) {
1210
- for (String key : _v .keySet ()) {
1211
- if (_v .get (key ) == null ) {
1212
- keys = key ;
1213
- flag = true ;
1204
+ if (_v instanceof JSONObject ) {
1205
+ JSONObject jsonObject = (JSONObject ) _v ;
1206
+ if (jsonObject .keySet ().size () != 0 ) {
1207
+ for (String key : jsonObject .keySet ()) {
1208
+ if (jsonObject .get (key ) == null ) {
1209
+ keys = key ;
1210
+ flag = true ;
1211
+ }
1214
1212
}
1213
+ } else {
1214
+ flag = true ;
1215
1215
}
1216
- } else {
1217
- flag = true ;
1218
1216
}
1219
1217
1220
1218
//Query query = new Query();
@@ -1236,8 +1234,7 @@ private String Operation_cg(String gridKey, JSONObject bson) {
1236
1234
return "删除失败" ;
1237
1235
}
1238
1236
} else {
1239
- JSONObject _k = JfGridFileUtil .getObjectByObject (_config , k );
1240
- if (_k != null ) {
1237
+ if (_config .containsKey (k )) {
1241
1238
//新值覆盖旧值
1242
1239
//_k.putAll(_v);
1243
1240
keyName = "config," + k ;
@@ -1247,7 +1244,7 @@ private String Operation_cg(String gridKey, JSONObject bson) {
1247
1244
} else {
1248
1245
//插入一个
1249
1246
//update.set("config."+k,_v);
1250
- _result = recordDataUpdataHandle .updateJsonbForSetRootNull (query , "config," + k , _v , null , "\" config\" :{\" " + k + "\" :\" \" }" );
1247
+ _result = recordDataUpdataHandle .updateJsonbForSetRootNull (query , "config," + k , ( JSONObject ) _v , null , "\" config\" :{\" " + k + "\" :\" \" }" );
1251
1248
//update.set("jfgridfile."+_sheetPosition+".config."+k,_v);
1252
1249
}
1253
1250
if (!_result ) {
0 commit comments