From 774158ac459f660636d755e6b963ef7a8420c158 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 23 Nov 2021 16:02:54 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E4=BF=AE=E6=94=B9=EF=BC=9A=20?=
 =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VaccinationInfoServiceImpl.java | 11 ++++++++---
 .../mapper/epidemic/EpidemicUserInfoDao.xml      | 16 ++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java
index 1180ada..5543954 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java
@@ -389,13 +389,18 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
 
         // 网格信息
         List<String> idCards = new ArrayList<>(maxDoseMap.keySet());
-        List<EpidemicUserDeptInfoDTO> userDeptInfoList = epidemicUserInfoDao.selectDeptInfoByIdCards(idCards);
-        Map<String, EpidemicUserDeptInfoDTO> deptMaps = userDeptInfoList.stream().collect(Collectors.toMap(EpidemicUserDeptInfoDTO::getIdCard, Function.identity()));
+        List<EpidemicUserDeptInfoDTO> userDeptInfoList = new ArrayList<>();
+        Map<String, EpidemicUserDeptInfoDTO> deptMaps = new HashMap<>();
+        if (!idCards.isEmpty()) {
+            userDeptInfoList = epidemicUserInfoDao.selectDeptInfoByIdCards(idCards);
+            deptMaps = userDeptInfoList.stream().collect(Collectors.toMap(EpidemicUserDeptInfoDTO::getIdCard, Function.identity()));
+        }
 
         // 插入接种数据
         if (!addList.isEmpty()) {
             List<VaccinationInfoEntity> insertUserList = ConvertUtils.sourceToTarget(addList, VaccinationInfoEntity.class);
             List<EpidemicUserInoutRecordEntity> finalAddressList = addressList;
+            Map<String, EpidemicUserDeptInfoDTO> finalDeptMaps = deptMaps;
             insertUserList.forEach(entity -> {
                 entity.setIdentityNo(entity.getIdentityNo().toUpperCase());
                 Optional<EpidemicUserInoutRecordEntity> addressOptional = finalAddressList.stream().filter(address -> address.getIdCard().equals(entity.getIdentityNo())).findFirst();
@@ -406,7 +411,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
                     entity.setGrid(addressOptional.get().getGridName());
                     entity.setVillageName(addressOptional.get().getPlot());
                 }
-                EpidemicUserDeptInfoDTO dept = deptMaps.get(entity.getIdentityNo().toUpperCase());
+                EpidemicUserDeptInfoDTO dept = finalDeptMaps.get(entity.getIdentityNo().toUpperCase());
                 if (dept != null) {
                     entity.setGridId(dept.getGridId());
                     entity.setParentDeptIds(dept.getParentDeptIds());
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index 6b875c5..d75e30b 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -230,19 +230,15 @@
         SELECT
         i.ID_CARD,
         i.USER_NAME,
-        h.GRID_ID,
-        h.PARENT_DEPT_IDS,
-        h.PARENT_DEPT_NAMES,
-        h.ALL_DEPT_IDS,
-        h.ALL_DEPT_NAMES
+        i.GRID_ID,
+        i.PARENT_DEPT_IDS,
+        i.PARENT_DEPT_NAMES,
+        i.ALL_DEPT_IDS,
+        i.ALL_DEPT_NAMES
         FROM
         epidemic_user_info i
-        LEFT JOIN epdc_house_resident r ON r.RESIDENT_ID = i.id
-        LEFT JOIN epdc_housing_information h ON r.HOUSE_ID = h.id
         WHERE
-        h.DEL_FLAG = '0'
-        AND i.DEL_FLAG = '0'
-        AND r.DEL_FLAG = '0'
+        i.DEL_FLAG = '0'
         AND i.ID_CARD IN
         <foreach collection="idCards" index="index" item="idCard" open="(" separator="," close=")">
             #{idCard}