From b69f7d42b91856b9448676a51eefef6b36f6bdb3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 13 二月 2025 10:30:49 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java index 458ec6c..cbe4cc0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java @@ -118,6 +118,7 @@ CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO(); TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordMapper.selectOne(new LambdaQueryWrapper<TCheckAcceptRecord>() .eq(TCheckAcceptRecord::getContractId, id)); + if (tCheckAcceptRecord==null)return checkAcceptRecordVO; BeanUtils.copyProperties(tCheckAcceptRecord,checkAcceptRecordVO); THouse tHouse = houseMapper.selectById(tCheckAcceptRecord.getHouseId()); tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus())); -- Gitblit v1.7.1