xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复车辆恢复bug

dev
lisai17@sina.com 2021-06-29 15:10:05 +08:00
parent dcab4ff837
commit 97924ae0f8
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java
View File

@ -87,7 +87,7 @@ public class TruckSyncService extends BaseSyncService {
public Result delete(Truck model, Sysuser sysuser) { public Result delete(Truck model, Sysuser sysuser) {
try { try {
// 注意这里有 ！，找到后才做 update 操作 // 注意这里有 ！，找到后才做 update 操作
BaseModel oldobj = (BaseModel) model.findByPk(); Truck oldobj = model.findByPk();
if (oldobj == null) { if (oldobj == null) {
return Result.failed(false, "按主键未找到对应记录"); return Result.failed(false, "按主键未找到对应记录");
@ -97,10 +97,10 @@ public class TruckSyncService extends BaseSyncService {
return Result.failed(false, "不存在逻辑删除字段"); return Result.failed(false, "不存在逻辑删除字段");
} }
model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
synctask.addUpdateData(model); synctask.addUpdateData(oldobj);
AuthLicense authlic = new AuthLicense(); AuthLicense authlic = new AuthLicense();
authlic.setTruckLicense(model.getLicense()); authlic.setTruckLicense(model.getLicense());
@ -111,7 +111,7 @@ public class TruckSyncService extends BaseSyncService {
@Override @Override
public boolean run() { public boolean run() {
try { try {
return model.update() return oldobj.update()
&& SyncTaskService.me.save(synctask) && SyncTaskService.me.save(synctask)
&& ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
@ -121,12 +121,6 @@ public class TruckSyncService extends BaseSyncService {
} }
}); });
// 将修改后的对象返回
String[] keys = model._getAttrNames();
for (String key : keys) {
oldobj.set(key, model.get(key));
}
return ret ? Result.object(oldobj) : Result.failed(false, "删除失败"); return ret ? Result.object(oldobj) : Result.failed(false, "删除失败");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -174,12 +168,6 @@ public class TruckSyncService extends BaseSyncService {
} }
}); });
// 将修改后的对象返回
String[] keys = model._getAttrNames();
for (String key : keys) {
oldobj.set(key, model.get(key));
}
return ret ? Result.object(oldobj) : Result.failed(false, "恢复失败"); return ret ? Result.object(oldobj) : Result.failed(false, "恢复失败");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);