From fbea6391af0df3040a51cfe40b74de995b385fee Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期三, 23 九月 2026 20:17:45 +0800
Subject: [PATCH] 坤源化工提交

---
 src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
index 0feab41..cab1fcd 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
@@ -49,10 +49,17 @@
     @Override
     public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
         Long tenantId = SecurityUtils.getLoginUser().getTenantId();
-        SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
+        String deptName = null;
+        if (tenantId != null) {
+            SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
+            if (sysDept != null) {
+                deptName = sysDept.getDeptName();
+            }
+        }
         IPage<AfterSalesServiceNewDto> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
+        String finalDeptName = deptName;
         afterSalesServiceIPage.getRecords().forEach(item -> {
-            item.setDeptName(sysDept.getDeptName());
+            item.setDeptName(finalDeptName);
         });
         return afterSalesServiceIPage;
     }

--
Gitblit v1.9.3