lisai17@sina.com 2020-10-15 14:18:32 +08:00
parent 8afc128f4d
commit 01953ff83d
1 changed files with 22 additions and 20 deletions

View File

@ -201,30 +201,32 @@ public class ModifyLogService {
}
}
List<Transport> transports = Transport.dao.find("select * from transport t where t.id in(" + StrKit.join(sqlparams, ",") + ")", params.toArray());
if(!params.isEmpty()){
List<Transport> transports = Transport.dao.find("select * from transport t where t.id in(" + StrKit.join(sqlparams, ",") + ")", params.toArray());
for (Record record : list) {
try {
String content = record.getStr("editdata");
for (Record record : list) {
try {
String content = record.getStr("editdata");
if (content == null) {
continue;
}
JSONObject obj = JSONObject.parseObject(content);
String id = obj.getString("id");
for (Transport transport : transports) {
if (transport.getId().equals(id)) {
record.set("truck_license", transport.getTruckLicense());
record.set("order_sn", transport.getOrderSn());
record.set("state", transport.getState());
if (content == null) {
continue;
}
}
record.remove("editdata");
} catch (Exception e) {
log.error(e.getMessage(), e);
JSONObject obj = JSONObject.parseObject(content);
String id = obj.getString("id");
for (Transport transport : transports) {
if (transport.getId().equals(id)) {
record.set("truck_license", transport.getTruckLicense());
record.set("order_sn", transport.getOrderSn());
record.set("state", transport.getState());
}
}
record.remove("editdata");
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
}