From 4826ae00c78e9a473bcfe0f85cf6d8d766a0010e Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 21 Jan 2025 17:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/backstage/service/CarSupServiceImpl.java     | 8 ++------
 .../mappers/business/backstage/CarTypeMapper.xml          | 7 +++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java
index d9a2d20..7346431 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java
@@ -13,10 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -160,8 +157,7 @@ public class CarSupServiceImpl implements CarSupService{
             if(StringHelper.isEmpty(data.getUserId())){
                 return ServerResponse.createErroe("至少选择一个用户进行绑定");
             }
-
-            String user= UserUtil.getLoginUser().getUserId()+"";
+            String user= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId()+"";
             data.setCreator(user);
             data.setUpdater(user);
            String supId=data.getSupId();
diff --git a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
index da0f1b4..4d1c208 100644
--- a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
@@ -63,9 +63,12 @@
                 select count(1)
                 from car_ma_type
                 where name=#{name} and level=#{level}
-                <if test="id!=null and id!=''">
+                  <if test="parentId!=null and parentId!=''">
+                      and parent_id=#{parentId}
+                  </if>
+                  <if test="id!=null and id!=''">
                     and id!=#{id}
-                </if>
+                  </if>
     </select>
     <select id="getCarTypeById" resultType="com.bonus.gzcar.business.backstage.entity.CarTypeVo">
         select if(cmt.id=1,0, cmt.id) id ,cmt.parent_id parentId,cmt.`name` title,cmt.is_active isActive,