Merge branch 'v6.4_transportation_20231110' into test

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckServiceImpl.java

@@ -42,6 +42,8 @@ public class CollectTruckServiceImpl implements CollectTruckService {
 
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
+
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -75,6 +77,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
 
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -109,6 +112,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
 
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -140,6 +144,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
         Long userNo = loginUserInfo.getUserNo();
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -158,6 +163,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
         Long userNo = loginUserInfo.getUserNo();
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -176,6 +182,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
         Long userNo = loginUserInfo.getUserNo();
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -194,6 +201,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
         Long userNo = loginUserInfo.getUserNo();
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());
@@ -212,6 +220,7 @@ public class CollectTruckServiceImpl implements CollectTruckService {
         Long userNo = loginUserInfo.getUserNo();
         CollectTruck truck = collectTruckDao.getByUserNoAndTruckNo(userNo, param.getTruckNo()).orNull();
         if (truck == null) {
+            truck = new CollectTruck();
             truck.setUserNo(userNo);
             truck.setName(loginUserInfo.getUserName());
             truck.setMobile(loginUserInfo.getUserMobile());