From 97924ae0f81cddd69f82e5ff5249dd974000925f Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Tue, 29 Jun 2021 15:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssjygl/truck/TruckSyncService.java        | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java
index 0a82cd2..14f23f5 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java
@@ -87,7 +87,7 @@ public class TruckSyncService extends BaseSyncService {
     public Result delete(Truck model, Sysuser sysuser) {
         try {
             // 注意这里有 ！，找到后才做 update 操作
-            BaseModel oldobj = (BaseModel) model.findByPk();
+            Truck oldobj = model.findByPk();
 
             if (oldobj == null) {
                 return Result.failed(false, "按主键未找到对应记录");
@@ -97,10 +97,10 @@ public class TruckSyncService extends BaseSyncService {
                 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.addUpdateData(model);
+            synctask.addUpdateData(oldobj);
 
             AuthLicense authlic = new AuthLicense();
             authlic.setTruckLicense(model.getLicense());
@@ -111,7 +111,7 @@ public class TruckSyncService extends BaseSyncService {
                 @Override
                 public boolean run() {
                     try {
-                        return model.update()
+                        return oldobj.update()
                                 && SyncTaskService.me.save(synctask)
                                 && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser);
                     } 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, "删除失败");
         } catch (Exception 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, "恢复失败");
         } catch (Exception e) {
             log.error(e.getMessage(), e);