From d47ae79c4855beb1ebc1ad1b3c6eff030e9d068a Mon Sep 17 00:00:00 2001
From: mash <m18301310996@163.com>
Date: Mon, 13 Feb 2023 10:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../staff/service/impl/ExchangeServiceImpl.java  | 16 +++++++++++++++-
 .../staff/service/impl/PersonnelServiceImpl.java |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

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<ExchangeMapper, Exchange> 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<Attachment> attachments = attachmentMapper.selectList(new LambdaQueryWrapper<Attachment>().eq(Attachment::getTargetId, exchange.getId()));
         List<AttachmentDto> 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<PersonnelMapper, Personnel
                 .eq(ObjectUtil.isNotNull(request.getHireDate()),Personnel::getHireDate,request.getHireDate())
                 .eq(ObjectUtil.isNotNull(request.getResignationTime()),Personnel::getResignationTime,request.getResignationTime())
                 .eq(StrUtil.isNotBlank(request.getWorkState()),Personnel::getWorkState,request.getWorkState())
-                .eq(StrUtil.isNotBlank(request.getReceipts()),Personnel::getRecruitNumber,request.getReceipts())
+                .eq(StrUtil.isNotBlank(request.getReceipts()),Personnel::getReceipts,request.getReceipts())
                 .eq(StrUtil.isNotBlank(request.getAlterationSign()),Personnel::getAlterationSign,request.getAlterationSign());
         wrapper.lambda().like(Personnel::getUserName,request.getUserName())
                 .like(Personnel::getNumberId,request.getNumberId())