From f488a83954c1ca79d127fc43977d1f3d730c9dde Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 13:40:12 +0800
Subject: [PATCH] fix: 原材料入库移除审批

---
 src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 95e9999..2da2be7 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.aftersalesservice.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.aftersalesservice.dto.AfterSalesServiceExeclDto;
@@ -97,12 +98,15 @@
     @ApiOperation("鍞悗鏈嶅姟-淇敼")
     @Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
-        if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
+        if (afterSalesServiceNewDto.getProductModelIdList() != null && !afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
             String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
                     .map(String::valueOf)
                     .collect(Collectors.joining(","));
             afterSalesServiceNewDto.setProductModelIds(productModelIds);
         }
+        if (afterSalesServiceNewDto.getAfterSalesProductList() != null && !afterSalesServiceNewDto.getAfterSalesProductList().isEmpty()) {
+            afterSalesServiceNewDto.setAfterSalesProducts(JSON.toJSONString(afterSalesServiceNewDto.getAfterSalesProductList()));
+        }
         boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
         return update ? AjaxResult.success() : AjaxResult.error();
     }

--
Gitblit v1.9.3