From b818d97d425b0f5ab96faf10b275df72263c22bf Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 22 九月 2026 10:01:30 +0800
Subject: [PATCH] fix: 修复售后处理查询报错问题

---
 src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 a141327..a88085b 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
@@ -11,6 +11,8 @@
 import com.ruoyi.aftersalesservice.service.AfterSalesServiceService;
 import com.ruoyi.common.utils.OrderUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+
+import java.time.LocalDateTime;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
@@ -47,12 +49,12 @@
 
     @Override
     public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
-        Long tenantId = SecurityUtils.getLoginUser().getTenantId();
-        SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
+        //Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+        //SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
         IPage<AfterSalesServiceNewDto> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
-        afterSalesServiceIPage.getRecords().forEach(item -> {
-            item.setDeptName(sysDept.getDeptName());
-        });
+        //afterSalesServiceIPage.getRecords().forEach(item -> {
+        //    item.setDeptName(sysDept.getDeptName());
+        //});
         return afterSalesServiceIPage;
     }
 
@@ -69,7 +71,7 @@
         if(sysUser == null) throw new RuntimeException("瀹℃牳浜轰笉瀛樺湪");
         afterSalesServiceNewDto.setCheckNickName(sysUser.getNickName());
         if (StringUtils.isEmpty(afterSalesServiceNewDto.getAfterSalesServiceNo())) {
-            String string = OrderUtils.countAfterServiceTodayByCreateTime(afterSalesServiceMapper, "SH_");
+            String string = OrderUtils.countAfterServiceTodayByCreateTime(afterSalesServiceMapper, "SH_", afterSalesServiceNewDto.getCreateTime() != null ? afterSalesServiceNewDto.getCreateTime() : LocalDateTime.now());
             afterSalesServiceNewDto.setAfterSalesServiceNo(string);
         }
         return this.save(afterSalesServiceNewDto);

--
Gitblit v1.9.3