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

This commit is contained in:
2025-10-25 22:16:07 +08:00

View File

@ -309,6 +309,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
}
@Override
@Transactional(rollbackFor = Exception.class)
public R<String> delCorrespondent(Long[] dto) {
for (int i = dto.length - 1; i >= 0; i--) {
@ -571,8 +572,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
public void delCorrespondentVoid(Long dto){
// 删除中间表
XzdCustomerSupplierYyb xzdCustomerSupplierYyb = iXzdCustomerSupplierYybService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdCustomerSupplierYyb>().eq(XzdCustomerSupplierYyb::getCSId, dto));
if (xzdCustomerSupplierYyb == null) {
List<XzdCustomerSupplierYyb> xzdCustomerSupplierYyb = iXzdCustomerSupplierYybService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdCustomerSupplierYyb>().eq(XzdCustomerSupplierYyb::getCSId, dto));
if (xzdCustomerSupplierYyb == null || xzdCustomerSupplierYyb.size() == 0) {
iXzdCustomerSupplierService.getBaseMapper().delete(new LambdaQueryWrapper<XzdCustomerSupplier>().eq(XzdCustomerSupplier::getCSId, dto));
}else {
throw new RuntimeException("该客户信息已被使用,无法删除");