Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

sen

2025-12-22 de17f911865ad0c3a52754140828db92c9e62e46

 service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java

@@ -17,6 +17,7 @@

import com.ruoyi.cwgl.mapper.PayableFeeManagementMapper;
import com.ruoyi.cwgl.domain.PayableFeeManagement;
import com.ruoyi.cwgl.domain.PayableFeeDetail;
import com.ruoyi.cwgl.service.IPayableFeeManagementService;
import com.ruoyi.cwgl.service.IPayableFeeDetailService;
import com.ruoyi.common.core.text.Convert;
@@ -49,7 +50,15 @@
    @Override
    public PayableFeeManagement selectPayableFeeManagementById(Integer id)
    {
        return payableFeeManagementMapper.selectPayableFeeManagementById(id);
        PayableFeeManagement payableFeeManagement = payableFeeManagementMapper.selectPayableFeeManagementById(id);
        if (payableFeeManagement != null) {
            // 查询对应的费用明细
            PayableFeeDetail detail = new PayableFeeDetail();
            detail.setPayableFeeId(id);
            List<PayableFeeDetail> detailList = payableFeeDetailService.selectPayableFeeDetailList(detail);
            payableFeeManagement.setPayableFeeDetailList(detailList);
        }
        return payableFeeManagement;
    }

    /**
@@ -198,3 +207,5 @@
        return payableFeeManagementMapper.deletePayableFeeManagementById(id);
    }
}