From cf20d164dadcf7544921a7138d91d3d16407673e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 23:55:16 +0800
Subject: [PATCH] 修改功能

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index aed49e9..eabfa7b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -145,12 +145,14 @@
                 returnList.add(carModel);
             }
         }
-        TServerCarmodel carModel = new TServerCarmodel();
-        carModel.setId(type.getId());
-        carModel.setName(type.getName());
-        carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
-        carModel.setPriceType(null);
-        returnList.add(carModel);
+        if(null != type){
+            TServerCarmodel carModel = new TServerCarmodel();
+            carModel.setId(type.getId());
+            carModel.setName(type.getName());
+            carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
+            carModel.setPriceType(null);
+            returnList.add(carModel);
+        }
         return returnList;
     }
 

--
Gitblit v1.7.1