diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 0f40d25f08..5a37057427 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -61,18 +61,21 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @author yinzuomei
      * @date 2021/10/28 11:20 上午
      */
-    List<Map<String, Object>> selectListMapById(String icResiUserId);
+    List<Map<String, Object>> selectListMapById(@Param("customerId") String customerId,
+                                                @Param("icResiUserId")String icResiUserId);
 
     /**
      * 根据ic_resi_user.id去查询各个子表记录，动态传入表名
      *
      * @param icResiUserId
-     * @param tableName
+     * @param subTableName
      * @return  java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      * @author yinzuomei
      * @date 2021/10/28 11:19 上午
      */
-    List<Map<String, Object>> selectSubTableRecords(@Param("icResiUserId") String icResiUserId,@Param("tableName") String tableName);
+    List<Map<String, Object>> selectSubTableRecords(@Param("customerId")String customerId,
+                                                    @Param("icResiUserId") String icResiUserId,
+                                                    @Param("subTableName") String subTableName);
 
     List<Map<String, Object>> selectListResiMapForExport(@Param("customerId") String customerId,
                                                          @Param("formCode")String formCode,
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 1d41753926..537e910e61 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -389,7 +389,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO) {
         Map resultMap = new HashMap();
         // 先查询主表，主表没有记录，直接返回空
-        List<Map<String, Object>> icResiUserMapList = baseDao.selectListMapById(pageFormDTO.getIcResiUserId());
+        List<Map<String, Object>> icResiUserMapList = baseDao.selectListMapById(pageFormDTO.getCustomerId(),pageFormDTO.getIcResiUserId());
         if (CollectionUtils.isEmpty(icResiUserMapList)) {
             return new HashMap();
         }
@@ -399,7 +399,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Result<Set<String>> subTableRes=operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO);
         if(subTableRes.success()&&!CollectionUtils.isEmpty(subTableRes.getData())){
             for (String subTalbeName : subTableRes.getData()) {
-                List<Map<String, Object>> list = baseDao.selectSubTableRecords(pageFormDTO.getIcResiUserId(), subTalbeName);
+                List<Map<String, Object>> list = baseDao.selectSubTableRecords(pageFormDTO.getCustomerId(),pageFormDTO.getIcResiUserId(), subTalbeName);
                 if (!CollectionUtils.isEmpty(list)) {
                     resultMap.put(subTalbeName, list);
                 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 90d4b25c3d..7579bddfc9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -36,15 +36,40 @@
     </update>
 
 
-    <select id="selectListMapById" parameterType="java.lang.String" resultType="map">
-        select * from ic_resi_user where del_flag='0' and id=#{icResiUserId}
+    <select id="selectListMapById" parameterType="map" resultType="map">
+        select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}
     </select>
 
     <select id="selectSubTableRecords" parameterType="map" resultType="map">
-        select * from ${tableName} where del_flag='0' and IC_RESI_USER=#{icResiUserId}
+        select * from ${subTableName} where del_flag='0' and IC_RESI_USER=#{icResiUserId} and customer_id=#{customerId}
     </select>
 
 
+    <!-- 公用where条件   -->
+    <sql id="listWhere">
+        ic_resi_user.DEL_FLAG = '0'
+        and ic_resi_user.customer_id=#{customerId}
+        <if test="null != conditions and conditions.size() > 0">
+            <foreach item="subCondition" collection="conditions" open="" separator="" close="">
+                <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
+                    </if>
+                </if>
+            </foreach>
+        </if>
+    </sql>
+
+    <!--   查询列表用  -->
     <select id="selectListResiMap" parameterType="map" resultType="map">
         select
         ic_resi_user.id as icResiUserId,
@@ -65,31 +90,17 @@
         left join ic_resi_demand_dict
         on(ic_resi_user.customer_id=ic_resi_demand_dict.CUSTOMER_ID
         and ic_resi_demand.CATEGORY_CODE=ic_resi_demand_dict.CATEGORY_CODE )
+        <where>
+            <include refid="listWhere"></include>
+        </where>
+        group by IC_RESI_USER.id
+        order by ic_resi_user.CREATED_TIME desc
+    </select>
+
 
-        WHERE
-        ic_resi_user.DEL_FLAG = '0'
-        and ic_resi_user.customer_id=#{customerId}
-        <if test="null != conditions and conditions.size() > 0">
-            <foreach item="subCondition" collection="conditions" open="" separator="" close="">
-                <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
 
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
-                    </if>
 
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
-                    </if>
 
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
-                    </if>
-                </if>
-            </foreach>
-        </if>
-        group by IC_RESI_USER.id
-        order by ic_resi_user.CREATED_TIME desc
-    </select>
 
     <select id="selectListResiMapForExport" parameterType="map" resultType="map">
         select
@@ -106,28 +117,9 @@
         left join ic_resi_demand_dict
         on(ic_resi_user.customer_id=ic_resi_demand_dict.CUSTOMER_ID
         and ic_resi_demand.CATEGORY_CODE=ic_resi_demand_dict.CATEGORY_CODE )
-
-        WHERE
-        ic_resi_user.DEL_FLAG = '0'
-        and ic_resi_user.customer_id=#{customerId}
-        <if test="null != conditions and conditions.size() > 0">
-            <foreach item="subCondition" collection="conditions" open="" separator="" close="">
-                <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
-
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
-                    </if>
-
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
-                    </if>
-
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
-                    </if>
-                </if>
-            </foreach>
-        </if>
+        <where>
+            <include refid="listWhere"></include>
+        </where>
         group by IC_RESI_USER.id
         order by ic_resi_user.CREATED_TIME desc
     </select>