From b65171017a7b83620669cf9226397269c249a351 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 15:11:34 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 14a4c4d..4050407 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -154,7 +154,6 @@
     }
 
     private void dealUpdateByList(List<VehicleTimeRangeInfoResponse> list) {
-        List<Cars> newList = new ArrayList<>();
         if(list == null || list.size()==0){
             return   ;
         }
@@ -177,17 +176,21 @@
                 c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
                 if(StringUtils.isNotBlank(model.getPersonId())){
                     //琚闂汉
-                    Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+                    Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                            .eq(Member::getHkId,model.getPersonId())
+                            .last("limit 1"));
                     c.setMemberId(member!=null?member.getId():null);
                     if(member!=null){
                         carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
                                 .set(CarEvent::getMemberId,member.getId())
                                 .eq(CarEvent::getPlateNos,c.getCode())
-                                .apply("member_id is null or member_id=''")
+                                .apply("(member_id is null or member_id='')")
                         );
                     }
                 }
-                Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda().eq(Cars::getHkId,model.getVehicleId()).last("limit 1"));
+                Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
+                        .eq(Cars::getHkId,model.getVehicleId())
+                        .last("limit 1"));
                 if(cars!=null){
                     //鏇存柊
                     c.setId(cars.getId());
@@ -196,7 +199,6 @@
                     //鏂板
                     carsMapper.insert(c);
                 }
-
             }
 
         }
@@ -220,13 +222,15 @@
             c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
             if(StringUtils.isNotBlank(model.getPersonId())){
                 //琚闂汉
-                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                        .eq(Member::getHkId,model.getPersonId())
+                        .last("limit 1"));
                 c.setMemberId(member!=null?member.getId():null);
                 if(member!=null){
                     carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
                             .set(CarEvent::getMemberId,member.getId())
                             .eq(CarEvent::getPlateNos,c.getCode())
-                            .apply("member_id is null or member_id=''")
+                            .apply("(member_id is null or member_id='')")
                     );
                 }
             }

--
Gitblit v1.9.3