From 2da1ceb2e91e4f11b36568f46f228700a55cad06 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 19 Nov 2021 09:56:25 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E4=BF=AE=E6=94=B9=201=E3=80=81?=
 =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89=202?=
 =?UTF-8?q?=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=80=A7=E5=88=AB=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VaccinationInfoServiceImpl.java | 16 +++++++++-------
 .../resources/mapper/vim/VaccinationInfoDao.xml  |  9 ++++++---
 2 files changed, 15 insertions(+), 10 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 ac91348..55c294b 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
@@ -48,10 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -110,8 +107,13 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         if (user == null) {
             throw new RenException("用户未登录");
         }
-        Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
-        params.putAll(authParams);
+        // 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)) {
@@ -621,4 +623,4 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
     public EpdcAppVimInfoResultDTO getUserVimInfo(String userName, String idCard) {
         return baseDao.getUserVimInfo(userName, idCard.toUpperCase());
     }
-}
\ No newline at end of file
+}
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
index 9d54196..f918b6d 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
@@ -9,7 +9,7 @@
         v.REAL_NAME,
         v.IDENTITY_NO,
         v.MOBILE,
-        CASE WHEN v.SEX = 1 THEN '男' WHEN  v.SEX = 0 THEN '女' ELSE v.SEX END AS SEX,
+        CASE WHEN v.SEX = '1' THEN '男' WHEN  v.SEX = '0' THEN '女' ELSE v.SEX END AS SEX,
         v.COUNTY,
         v.STREET,
         v.COMMUNITY,
@@ -42,8 +42,11 @@
         <if test="mobile != null and mobile != ''">
             AND v.MOBILE LIKE concat('%', #{mobile}, '%')
         </if>
-        <if test="companyId != null and companyId != ''">
-            AND v.COMPANY_ID = #{companyId}
+        <if test="companyIds != null">
+            AND v.COMPANY_ID in
+            <foreach item="companyId" collection="companyIds" open="(" separator="," close=")">
+                #{companyId}
+            </foreach>
         </if>
         <if test="siteId != null and siteId != ''">
             AND v.SITE_ID = #{siteId}