From 08de8e3b8840743b84ba9caa4a99762dee2fdc07 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 May 2021 11:37:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/evaluationindex/screen/ScreenProjectDataDao.java  | 3 +--
 .../screen/impl/ScreenProjectServiceImpl.java             | 8 ++++----
 .../main/resources/mapper/screen/ScreenProjectDataDao.xml | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
index cff827b63e..061d0b81f1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -17,8 +17,7 @@ public interface ScreenProjectDataDao {
 
     List<String> selectIdsByAreaCode(@Param("areaCode") String areaCode);
 
-    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId,
-                                                                 @Param("customerId") String customerId);
+    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId);
 
     List<String> selectProjectImgs(@Param("projectId") String projectId,
                                    @Param("customerId") String customerId);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index f5cdcd38d0..c2728396d0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -98,17 +98,17 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
 
     @Override
     public Result projectDistributionDetail(ScreenProjectDetailFormDTO formDTO) {
-        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId(),formDTO.getCustomerId());
+        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId());
         resultDTOS.forEach(item -> {
             //项目图片
-            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),formDTO.getCustomerId());
+            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),item.getCustomerId());
             item.setImgList(imgList);
             //项目处理流程
-            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),formDTO.getCustomerId());
+            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),item.getCustomerId());
                 //流程附件
             processDTOS.forEach(processDTO -> {
                 List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> attachmentDTOS =
-                        screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),formDTO.getCustomerId());
+                        screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),item.getCustomerId());
                 processDTO.setAttachments(attachmentDTOS);
             });
             item.setProcessList(processDTOS);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 968a477866..2f173078a0 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -72,7 +72,6 @@
         WHERE
             del_flag = '0'
             AND project_id = #{projectId}
-            and CUSTOMER_ID= #{customerId}
     </select>
     <select id="selectProjectImgs" resultType="java.lang.String">
         select PROJECT_IMG_URL from screen_project_img_data