diff --git a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java index 88c4aeb..c190efe 100644 --- a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java @@ -141,15 +141,29 @@ public class ExchangeServiceImpl extends BaseService i public AjaxResult selectById(String id) { Exchange exchange = getById(id); Personnel personnel = personnelMapper.selectById(exchange.getPersonnelId()); + if (ObjectUtil.isEmpty(personnel)){ + return AjaxResult.fail().msg("该用户不存在!"); + } CompanyName nowCompany = companyNameMapper.selectById(personnel.getCompanyName()); + if (ObjectUtil.isEmpty(nowCompany)){ + return AjaxResult.fail().msg("该用户不存在!"); + } Dept nowDept = deptMapper.selectById(personnel.getPresentDept()); + if (ObjectUtil.isEmpty(nowDept)){ + return AjaxResult.fail().msg("该用户不存在!"); + } CompanyName willCompany = companyNameMapper.selectById(exchange.getWillCompanyId()); + if (ObjectUtil.isEmpty(willCompany)){ + return AjaxResult.fail().msg("该用户不存在!"); + } Dept dept = deptMapper.selectById(exchange.getWillDept()); + if (ObjectUtil.isEmpty(dept)){ + return AjaxResult.fail().msg("该用户不存在!"); + } List attachments = attachmentMapper.selectList(new LambdaQueryWrapper().eq(Attachment::getTargetId, exchange.getId())); List attachmentDtos = BeanUtil.copyToList(attachments, AttachmentDto.class); - System.out.println("byId = " + exchange); ExchangeOneDto exchangeOneDto = BeanUtil.copyProperties(exchange, ExchangeOneDto.class); exchangeOneDto.setWillCompanyName(willCompany.getCompanyName()); exchangeOneDto.setWillCOde(willCompany.getCreditCode()); diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java index 8198fb7..7544c12 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -324,7 +324,7 @@ public class PersonnelServiceImpl extends BaseService