From fece924d4c7a58e19e5c631abcf9a075ded6d6fa Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 15 Nov 2024 11:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E8=BD=A6=E5=8A=9E?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandover/BusHandoverService.java   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index 7b7f86e6bf..a31a61aab2 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -1222,12 +1222,22 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                                 String modelName = item.getModelName();
                                 String carColor = data.getCarColor();
                                 sbModel.append(modelName + carColor).append(",");
+                            } else {
+                                sbModel.append(item.getModelName()).append(",");
                             }
+                        } else {
+                            sbModel.append(item.getModelName()).append(",");
                         }
+                    } else {
+                        sbModel.append(item.getModelName()).append(",");
                     }
                 }
-                sbVin.delete(sbVin.length() - 1, sbVin.length());
-                sbModel.delete(sbModel.length() - 1, sbModel.length());
+                if (sbVin.length() > 0) {
+                    sbVin.delete(sbVin.length() - 1, sbVin.length());
+                }
+                if (sbModel.length() > 0) {
+                    sbModel.delete(sbModel.length() - 1, sbModel.length());
+                }
                 permitVo.setVinNo(sbVin.toString());
                 permitVo.setModelName(sbModel.toString());
             }
@@ -3035,7 +3045,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 		}
 		return qw;
 	}
-	
+
 	public PagerVo<BusHandoverVo> listPageVo(PagerQuery<BusHandoverQuery> pq) {
 		BusHandoverQuery query = pq.getParams();
 		QueryWrapper<BusHandover> qw = createQueryWrapper(query);
@@ -3044,22 +3054,22 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 		PagerVo<BusHandoverVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public List<BusHandoverVo> listAllVo(BusHandoverQuery query) {
 		QueryWrapper<BusHandover> qw = createQueryWrapper(query);
 		return baseMapper.selectListAllVo(qw);
 	}
-	
+
 	public List<BusHandoverVo> listVo() {
 		return baseMapper.selectListVo();
 	}
-	
+
 	public void saveOrUpdateDto(BusHandoverDto dto){
 		BusHandover entity = new BusHandover();
 		dto.fillEntity(entity);
 		this.saveOrUpdate(entity);
 	}
-	
+
 	public BusHandoverVo fetchByIdVo(String id){
 		BusHandover entity = this.fetchById(id);
 		BusHandoverVo vo = new BusHandoverVo();
@@ -3133,4 +3143,4 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 	public int selectCountByOrgSid(String billsType, String date, String orgSid) {
 		return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
 	}*/
-}
\ No newline at end of file
+}