From 3eda614126164158b1e6d3e0aa50bbd84114242c Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 22 Nov 2021 16:25:21 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E4=BF=AE=E6=94=B9=EF=BC=9A=20?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E3=80=81=E7=96=AB=E8=8B=97?=
 =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=85=A5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan                                 | 2 +-
 .../vaccine/epidemic/excel/EpidecmicUserNewExcel.java    | 4 +++-
 .../epdc/vaccine/vim/excel/VaccinationInfoExcel.java     | 4 +++-
 .../vim/service/impl/VaccinationInfoServiceImpl.java     | 9 ++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 310ff06..d81d0d3 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 310ff06907d82bb878eda31bf6054542adc8cb5a
+Subproject commit d81d0d313a4556e4c6317e7924f98a8b0f6ce2ff
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java
index 35a8311..df7ffb0 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java
@@ -12,6 +12,8 @@ import lombok.Data;
 @Data
 public class EpidecmicUserNewExcel{
 
+    @Excel(name = "所属组织")
+    private String allDeptNames;
     @Excel(name = "县内居住地镇街")
     private String liveAddressName;
     @Excel(name = "社区/村庄")
@@ -115,4 +117,4 @@ public class EpidecmicUserNewExcel{
     @Excel(name = "是否接种",replace = { "未接种_0", "接种中_1", "接种完成_2"})
     private Integer vaccinationState;
 
-}
\ No newline at end of file
+}
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java
index dc15209..7ad203c 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java
@@ -13,6 +13,8 @@ import java.util.Date;
  */
 @Data
 public class VaccinationInfoExcel {
+    @Excel(name = "所属组织")
+    private String allDeptNames;
     @Excel(name = "真实姓名")
     private String realName;
     @Excel(name = "身份证号")
@@ -53,4 +55,4 @@ public class VaccinationInfoExcel {
     private Date createdTime;
     private String updatedBy;
     private Date updatedTime;
-}
\ No newline at end of file
+}
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 55c294b..1180ada 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
@@ -109,11 +109,6 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         }
         // Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
         // params.putAll(authParams);
-        String companyId = params.get("companyId") == null ? null : params.get("companyId").toString();
-        if (StringUtils.isNotBlank(companyId)) {
-            params.put("companyIds", Arrays.asList(companyId.split(",")));
-        }
-
 
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) {
@@ -126,6 +121,10 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
 
     @Override
     public List<VaccinationInfoDTO> getVaccinationInfoList(Map<String, Object> params) {
+        String companyId = params.get("companyId") == null ? null : params.get("companyId").toString();
+        if (StringUtils.isNotBlank(companyId)) {
+            params.put("companyIds", Arrays.asList(companyId.split(",")));
+        }
         List<VaccineDto> companyList = vaccineCompanyService.compantyList();
         Map<Long, String> companyMap = companyList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2));
         List<VaccineDto> siteList = vaccinationSiteService.getSiteList();