From 31489e3425cec1ec01433a6c8c217e6bcf37072c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 13 Oct 2021 11:16:09 +0800
Subject: [PATCH] =?UTF-8?q?customerId=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java    | 2 +-
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java       | 2 +-
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index 68f185ad89..0dd90bd8d0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -55,7 +55,7 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @author zxc
      * @date 2021/9/17 2:16 下午
      */
-    List<String> selectProjectKey(@Param("orgIds")List<String> orgIds);
+    List<String> selectProjectKey(@Param("orgIds")List<String> orgIds,@Param("customerId")String customerId);
 
     /**
      * @Description  根据keys查询project
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 56d4512f97..a77e2be2ad 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -209,7 +209,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             orgIds.add(oneOrg);
         }
         // 根据orgIds查询 问卷调查的key
-        List<String> projectKeys = baseDao.selectProjectKey(orgIds);
+        List<String> projectKeys = baseDao.selectProjectKey(orgIds,formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 48bd2f41bc..59dd4eb215 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -73,6 +73,7 @@
             DISTINCT project_key
         FROM pr_publish_range
         WHERE del_flag = 0
+          AND customer_id = #{customerId}
           AND (
               <foreach collection="orgIds" item="orgId" separator=" OR ">
                   #{orgId} LIKE CONCAT(org_ids,'%')