diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
index fa68853..4e376b4 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
@@ -83,7 +83,9 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
             params.put("deptIdList", user.getDeptIdList());
+            params.put("creatorId", user.getId());
         }
+
         List<PersonTestingPageDTO> list = baseDao.getTestingPage(params);
         return new PageData<>(list, page.getTotal());
     }
diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
index a05f0c9..07f00e4 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
@@ -54,10 +54,16 @@
         WHERE
         t.DEL_FLAG = 0
         <if test="deptIdList != null">
-            and t2.grid_id in
-            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
-                #{id}
-            </foreach>
+            AND (
+            <if test="deptIdList.size() > 0">
+                t2.grid_id in
+                <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                OR
+            </if>
+            CREATED_BY = #{creatorId}
+            )
         </if>
         <if test="name != null and name != ''">
             AND t.name like '%${name}%'
diff --git a/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls b/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls
index c0fa79f..4965389 100644
Binary files a/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls and b/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls differ
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 7c7ed70..1f94b84 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
@@ -115,7 +115,7 @@
             and (hi.grid_id = #{gridId}
             OR find_in_set(#{gridId},hi.ALL_DEPT_IDS))
         </if>
-        <if test="deptIdList != null">
+        <if test="deptIdList != null and deptIdList.size() > 0">
             and hi.grid_id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
                 #{id}
@@ -164,7 +164,7 @@
             and (hi.grid_id = #{gridId}
             OR find_in_set(#{gridId},hi.ALL_DEPT_IDS))
         </if>
-        <if test="deptIdList != null">
+        <if test="deptIdList != null and deptIdList.size() > 0">
             and hi.grid_id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
                 #{id}
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml
index 9129320..d7c85fa 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml
@@ -64,7 +64,7 @@
             and (t.grid_id = #{gridId}
             OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
         </if>
-        <if test="deptIdList != null">
+        <if test="deptIdList != null and deptIdList.size() > 0">
             and t.grid_id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
                 #{id}
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 aa3c407..9d54196 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
@@ -72,7 +72,7 @@
             and (v.grid_id = #{gridId}
             OR find_in_set(#{gridId},v.ALL_DEPT_IDS))
         </if>
-        <if test="deptIdList != null">
+        <if test="deptIdList != null and deptIdList.size() > 0">
             and v.grid_id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
                 #{id}