Skip to content

Commit c90d10d

Browse files
committed
Fix borderInfo update query
1 parent 2d5ee52 commit c90d10d

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Spring server to run as luckysheet server
99
- Base schema is defined in trena main api server as a form of prisma
1010
- It is recommended to use this server after applying the schema defined by prisma
1111

12+
## Active Profile
13+
14+
- Use `postgres` profile
15+
1216
## Deployment
1317

1418
1. Build Luckysheet

luckysheet/src/main/java/com/xc/luckysheet/db/server/JfGridUpdateService.java

+14-17
Original file line numberDiff line numberDiff line change
@@ -1186,12 +1186,8 @@ private String Operation_cg(String gridKey, JSONObject bson) {
11861186
String i = bson.get("i").toString();
11871187
String k = bson.get("k").toString();
11881188

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");
11931190
if (_v == null) {
1194-
//没有要修改的值
11951191
return "";
11961192
}
11971193

@@ -1202,19 +1198,21 @@ private String Operation_cg(String gridKey, JSONObject bson) {
12021198
//return "gridKey="+gridKey+"的数据表格不存在";
12031199
}
12041200

1205-
1206-
//判断_v中是否存在null,则删除该参数
1201+
// To determine whether there is null in _v, delete the parameter
12071202
boolean flag = false;
12081203
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+
}
12141212
}
1213+
} else {
1214+
flag = true;
12151215
}
1216-
} else {
1217-
flag = true;
12181216
}
12191217

12201218
//Query query = new Query();
@@ -1236,8 +1234,7 @@ private String Operation_cg(String gridKey, JSONObject bson) {
12361234
return "删除失败";
12371235
}
12381236
} else {
1239-
JSONObject _k = JfGridFileUtil.getObjectByObject(_config, k);
1240-
if (_k != null) {
1237+
if (_config.containsKey(k)) {
12411238
//新值覆盖旧值
12421239
//_k.putAll(_v);
12431240
keyName = "config," + k;
@@ -1247,7 +1244,7 @@ private String Operation_cg(String gridKey, JSONObject bson) {
12471244
} else {
12481245
//插入一个
12491246
//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 + "\":\"\"}");
12511248
//update.set("jfgridfile."+_sheetPosition+".config."+k,_v);
12521249
}
12531250
if (!_result) {

0 commit comments

Comments
 (0)