修复车辆恢复bug
parent
56ae190ce9
commit
dcab4ff837
|
|
@ -137,7 +137,7 @@ public class TruckSyncService extends BaseSyncService {
|
||||||
public Result restore(Truck model, Sysuser sysuser) {
|
public Result restore(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, "按主键未找到对应记录");
|
||||||
|
|
@ -147,12 +147,12 @@ public class TruckSyncService extends BaseSyncService {
|
||||||
return Result.failed(false, "不存在逻辑删除字段");
|
return Result.failed(false, "不存在逻辑删除字段");
|
||||||
}
|
}
|
||||||
|
|
||||||
model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del
|
oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del
|
||||||
|
|
||||||
SyncTask synctask = new SyncTask();
|
SyncTask synctask = new SyncTask();
|
||||||
|
|
||||||
AuthLicense authlic = new AuthLicense();
|
AuthLicense authlic = new AuthLicense();
|
||||||
authlic.setTruckLicense(model.getLicense());
|
authlic.setTruckLicense(oldobj.getLicense());
|
||||||
|
|
||||||
synctask.addSaveData(authlic); // 恢复车辆时,有效车牌要添加
|
synctask.addSaveData(authlic); // 恢复车辆时,有效车牌要添加
|
||||||
|
|
||||||
|
|
@ -160,9 +160,9 @@ public class TruckSyncService extends BaseSyncService {
|
||||||
@Override
|
@Override
|
||||||
public boolean run() {
|
public boolean run() {
|
||||||
try {
|
try {
|
||||||
boolean ret = model.update();
|
boolean ret = oldobj.update();
|
||||||
|
|
||||||
synctask.addUpdateData(model);
|
synctask.addUpdateData(oldobj);
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
&& SyncTaskService.me.save(synctask)
|
&& SyncTaskService.me.save(synctask)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue