From 20d3e1da6517ed5e55ae3613ccbbb01f1b9eda2e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 11:53:11 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的数据类型和业务逻辑问题

---
 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 55bfdce..99c2c17 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -169,7 +169,12 @@
     //鍙嶅悜鏂板鎴愬搧浜у搧锛屽彧鏈夐攢鍞叧鑱旀柊澧炵殑鏃跺�欒皟鐢�
     @Override
     public Long productModelAnticlockwise(ProductModelAnticlockwiseDto productModelDto) {
-        ProductModel oldProductModel = productModelMapper.selectOldProductModel(productModelDto.getModel(), productModelDto.getProductName());
+        ProductModel oldProductModel = new ProductModel();
+        if (ObjectUtils.isNotEmpty(productModelDto.getId())) {
+             oldProductModel = productModelMapper.selectById(productModelDto.getId());
+        }else {
+             oldProductModel = productModelMapper.selectOldProductModel(productModelDto.getModel(), productModelDto.getProductName());
+        }
         //瀛樺湪灏辨洿鏂�
         if (oldProductModel != null) {
             oldProductModel.setModel(productModelDto.getModel());

--
Gitblit v1.9.3