From fea2d693c33fdbcb4c8304a96a4e584829cb437b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 29 一月 2026 17:25:30 +0800
Subject: [PATCH] 申请开票和开票记录,科目管理界面

---
 service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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..086af11 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,6 +100,10 @@
     @PutMapping
     public AjaxResult edit(@RequestBody VoucherSubjectSetting voucherSubjectSetting)
     {
+        if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
+        {
+            return AjaxResult.error("淇敼绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+        }
         return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting));
     }
 

--
Gitblit v1.8.0