From c8b6f24a723f8744fed170d5ad4b18c488b2fd59 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 20 Apr 2022 17:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=8E=B0=E5=B7=A5=E4=BD=9C=E5=9C=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index c4f9548..1a6f249 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -1053,7 +1053,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             String residentsName = BaseResidentInformationUpdateExcel.getUserName() == null ? null : BaseResidentInformationUpdateExcel.getUserName().trim();
             String residentsSex = BaseResidentInformationUpdateExcel.getGender() == null ? null : BaseResidentInformationUpdateExcel.getGender().trim();
             String residentsNation = BaseResidentInformationUpdateExcel.getNation() == null ? null : BaseResidentInformationUpdateExcel.getNation().trim();
-            String currentEmployer = BaseResidentInformationUpdateExcel.getCurrentEmployer() == null ? null : BaseResidentInformationUpdateExcel.getCurrentEmployer().trim();
+            String workUnits = BaseResidentInformationUpdateExcel.getWorkUnits() == null ? null : BaseResidentInformationUpdateExcel.getWorkUnits().trim();
             String currentAddress = BaseResidentInformationUpdateExcel.getCurrentAddress() == null ? null : BaseResidentInformationUpdateExcel.getCurrentAddress().trim();
             String specialCrowd = BaseResidentInformationUpdateExcel.getSpecialCrowd() == null ? null : BaseResidentInformationUpdateExcel.getSpecialCrowd().trim();
             String peopleCategories = BaseResidentInformationUpdateExcel.getPeopleCategories() == null ? null : BaseResidentInformationUpdateExcel.getPeopleCategories().trim();
@@ -1097,8 +1097,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             if (StringUtils.isNotBlank((residentsNation))) {
                 BaseResidentInformationUpdateExcel.setNation(residentsNation);
             }
-            if (StringUtils.isNotBlank((currentEmployer))) {
-                BaseResidentInformationUpdateExcel.setCurrentEmployer(currentEmployer);
+            if (StringUtils.isNotBlank((workUnits))) {
+                BaseResidentInformationUpdateExcel.setWorkUnits(workUnits);
             }
             if (StringUtils.isNotBlank((currentAddress))) {
                 BaseResidentInformationUpdateExcel.setCurrentAddress(currentAddress);