From b3fece6fc350088e2c1b1e4611cd474ef83e5cf7 Mon Sep 17 00:00:00 2001
From: mash <m18301310996@163.com>
Date: Thu, 23 Feb 2023 17:11:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B91.01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../staff/service/impl/CompanyNameServiceImpl.java  |  5 +++--
 .../staff/service/impl/PersonnelServiceImpl.java    | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java
index 3f52f47..8387ea9 100644
--- a/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java
+++ b/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java
@@ -150,20 +150,21 @@ public class CompanyNameServiceImpl extends BaseService<CompanyNameMapper, Compa
             throw new RuntimeException(e);
         }
         CompanyNameMapper companyNameMapper = SpringUtil.getBean(CompanyNameMapper.class);
-        PersonnelStatementDto statementDto = new PersonnelStatementDto();
         List<PersonnelStatementDto> statementDtos = new ArrayList<>();
         LambdaQueryWrapper<CompanyName> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StrUtil.isNotBlank(id),CompanyName::getId,id);
         List<CompanyName> list = companyNameMapper.selectList(queryWrapper);
         list.forEach(System.out::println);
         for (CompanyName companyName : list) {
-            System.out.println("companyName = " + companyName.getId());
             Integer count = directorsSupervisorsMapper.selectCount(new LambdaQueryWrapper<DirectorsSupervisors>().eq(DirectorsSupervisors::getAuditState, 3).eq(DirectorsSupervisors::getOrganizationId, companyName.getId()));
             LambdaQueryWrapper<Personnel> wrapper = new LambdaQueryWrapper<Personnel>()
                     .eq(Personnel::getCompanyName, companyName.getId())
+                    .eq(Personnel::getWorkState,"在职")
+                    .eq(Personnel::getState,"2")
                     .ge(ObjectUtil.isNotNull(first), Personnel::getHireDate, first)
                     .le(ObjectUtil.isNotNull(finals), Personnel::getHireDate, finals);
             List<Personnel> listPersonnel = personnelMapper.selectList(wrapper);
+            PersonnelStatementDto statementDto = new PersonnelStatementDto();
             statementDto.setSupervisorsNum(count);
             statementDto.setCompetentDeptName("县发展和改革局");
             statementDto.setSocialCreditCode(companyName.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 9831c52..f2594a5 100644
--- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java
+++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java
@@ -255,9 +255,15 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
         per.setSpecialty(saveAlteration("专业更改", per.getSpecialty(), updateRequest.getSpecialty(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getSpecialty)).toString());
         per.setPresentDept(saveAlteration("所在部门更改", per.getPresentDept(), updateRequest.getPresentDept(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getPresentDept)).toString());
         per.setContractModality(saveAlteration("合同形式更改", per.getContractModality(), updateRequest.getContractModality(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getContractModality)).toString());
-        per.setCardFile(saveAlteration("身份证附件更改", per.getCardFile(), card, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getCardFile)).toString());
-        per.setEducationFile(saveAlteration("学历证书附件更改", per.getEducationFile(), education, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getEducationFile)).toString());
-        per.setAuditFile(saveAlteration("审批资料附件更改", per.getAuditFile(), audit, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getAuditFile)).toString());
+        if (StrUtil.isNotBlank(card)){
+            per.setCardFile(saveAlteration("身份证附件更改", per.getCardFile(), card, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getCardFile)).toString());
+        }
+        if (StrUtil.isNotBlank(education)){
+            per.setEducationFile(saveAlteration("学历证书附件更改", per.getEducationFile(), education, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getEducationFile)).toString());
+        }
+        if (StrUtil.isNotBlank(audit)){
+            per.setAuditFile(saveAlteration("审批资料附件更改", per.getAuditFile(), audit, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getAuditFile)).toString());
+        }
         per.setId("");
         per.setState("1");
         per.setAlterationSign("1");
@@ -629,7 +635,6 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
                 }
             }else if (ArgsConst.EXCHANGE.equals(type)) {
                 Exchange exchange = exchangeMapper.selectById(id);
-                System.out.println("exchange = " + exchange);
                 Personnel personnel = get(exchange.getPersonnelId());
                 if ("1".equals(personnel.getAlterationSign())||"1".equals(personnel.getChangeAlterationSign())){
                     return message="该人员有变更数据，不能进行选调！";