From a8a198b51f882bc46024bb4685fa5a6729252b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Sat, 25 Oct 2025 21:25:33 +0800
Subject: [PATCH] =?UTF-8?q?10-25-=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XzdCustomerinformationServiceImpl.java    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
index 6a82790d..8bceaeb1 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
@@ -2,7 +2,11 @@ package org.dromara.xzd.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
 import org.dromara.common.core.service.XzdCustomerSupplierService;
 import org.dromara.common.core.service.XzdCustomerinformationService;
@@ -10,25 +14,19 @@ import org.dromara.common.core.service.XzdSupplierInfoService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.dromara.system.domain.vo.SysDeptVo;
-import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.xzd.domain.XzdCustomerinformation;
 import org.dromara.xzd.domain.bo.XzdCustomerinformationBo;
 import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
-import org.dromara.xzd.domain.XzdCustomerinformation;
 import org.dromara.xzd.mapper.XzdCustomerinformationMapper;
 import org.dromara.xzd.service.IXzdCustomerinformationService;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 客户信息Service业务层处理
@@ -194,7 +192,7 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
             if (ObjectUtil.isNull(xzdCustomerSuppliervo) ){
                 return null;
             }
-            if (xzdCustomerSuppliervo.getType().equals("1")){
+            if (xzdCustomerSuppliervo.getType()!= null && xzdCustomerSuppliervo.getType().equals("1")){
                 XzdCustomerinformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
                 if (ObjectUtil.isNotNull(vo)) {
                     list.add(vo.getUnitName());