wujianwei
2026-03-20 10309399433091888260ea31c2ab330aa57d685f
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));
    }
    /**