From d3a26acb38a0747c5df33db848e5fb80ae2e97b9 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 06 三月 2026 10:45:12 +0800
Subject: [PATCH] 修改配置
---
service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 7a60e71..2c733a3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
@@ -68,9 +68,13 @@
*/
@PreAuthorize("@ss.hasPermi('cwgl:voucherSubjectSetting:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
+ public AjaxResult getInfo(@PathVariable Integer id)
{
- return AjaxResult.success(voucherSubjectSettingService.selectVoucherSubjectSettingById(id));
+ VoucherSubjectSetting subject = voucherSubjectSettingService.selectVoucherSubjectSettingById(id);
+ if (subject != null && subject.getAccountingItems() != null) {
+ subject.setAccountingItemsDesc(subject.getAccountingItemsDesc());
+ }
+ return AjaxResult.success(subject);
}
/**
@@ -81,6 +85,10 @@
@PostMapping
public AjaxResult add(@RequestBody VoucherSubjectSetting voucherSubjectSetting)
{
+ if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
+ {
+ return AjaxResult.error("鏂板绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+ }
return toAjax(voucherSubjectSettingService.insertVoucherSubjectSetting(voucherSubjectSetting));
}
@@ -92,7 +100,18 @@
@PutMapping
public AjaxResult edit(@RequestBody VoucherSubjectSetting voucherSubjectSetting)
{
- return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting));
+ // 鑾峰彇鍘熷鏁版嵁鐢ㄤ簬姣旇緝绉戠洰浠ｇ爜鏄惁鏀瑰彉
+ 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,original));
}
/**
--
Gitblit v1.8.0