From 849648e82e5dec96f9f30fcc9c9bd799268b1f4c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:44 +0800
Subject: [PATCH] 新增资金流水导入
---
service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java b/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
index 086af11..2c733a3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
@@ -100,11 +100,18 @@
@PutMapping
public AjaxResult edit(@RequestBody VoucherSubjectSetting voucherSubjectSetting)
{
- if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
- {
- return AjaxResult.error("淇敼绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+ // 鑾峰彇鍘熷鏁版嵁鐢ㄤ簬姣旇緝绉戠洰浠ｇ爜鏄惁鏀瑰彉
+ VoucherSubjectSetting original = voucherSubjectSettingService.selectVoucherSubjectSettingById(voucherSubjectSetting.getId());
+
+ // 鍙湁褰撶鐩唬鐮佸彂鐢熸敼鍙樻椂鎵嶈繘琛屽敮涓�鎬ф牎楠�
+ if (original != null && !original.getSubjectCode().equals(voucherSubjectSetting.getSubjectCode())) {
+ if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
+ {
+ return AjaxResult.error("淇敼绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+ }
}
- return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting));
+
+ return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting,original));
}
/**
--
Gitblit v1.8.0