From 3445fe4debc6b26cf7b4a2cdad7a3a778245adf2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 12 Jul 2021 10:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E5=88=A0=E9=99=A4=E6=94=B9=E4=B8=BA=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/evaluationindex/screen/ScreenProjectDataDao.java   | 4 ++--
 .../evaluationindex/screen/ScreenProjectImgDataDao.java    | 2 +-
 .../screen/impl/ScreenProjectDataServiceImpl.java          | 4 ++--
 .../mapper/evaluationindex/screen/ScreenProjectDataDao.xml | 7 ++++---
 .../evaluationindex/screen/ScreenProjectImgDataDao.xml     | 1 +
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
index 5410417202..4afa322825 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -54,7 +54,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
      * @param projectId
      * @return int
      */
-    int deleteByProjectId(@Param("projectId") String projectId);
+    int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
 
     /**
      * 根据项目ID删除数据
@@ -63,5 +63,5 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
      * @param list
      * @return int
      */
-    void deleteByProjectIds(@Param("list") List<String> list);
+    void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List<String> list);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
index 9335e8aa61..ff563a9f6e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
@@ -38,5 +38,5 @@ public interface ScreenProjectImgDataDao extends BaseDao<ScreenProjectImgDataEnt
 
 	void insertBatch(@Param("list") List<ScreenProjectImgDataDTO> list);
 
-	int deleteByProjectId(@Param("projectId") String projectId);
+	int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 8ac534876c..4db3552a39 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -173,8 +173,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 }
             }
             //先删除该projectId对应的旧数据
-            baseDao.deleteByProjectId(item.getProjectId());
-            screenProjectImgDataDao.deleteByProjectId(item.getProjectId());
+            baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
+            screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
 
             //如果orgType未知，获取一下
 //            if ("unknown".equals(item.getOrgType())){
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 2a123547f4..420f459034 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -49,15 +49,16 @@
     <delete id="deleteByProjectId">
         delete from screen_project_data
         where PROJECT_ID = #{projectId}
+        AND customer_id = #{customerId}
     </delete>
 
     <delete id="deleteByProjectIds">
         delete from screen_project_data
-        <where>
-            <foreach collection="list" item="projectId" separator=" or ">
+            where 1=1
+            AND customer_id = #{customerId}
+            <foreach collection="list" item="projectId" open="AND (" separator=" OR " close=" )">
                 PROJECT_ID = #{projectId}
             </foreach>
-        </where>
     </delete>
 
     <select id="checkIfExisted" resultType="int">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
index fc0dc48b34..b27cd6f405 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
@@ -29,6 +29,7 @@
     <delete id="deleteByProjectId">
         delete from screen_project_img_data
         where PROJECT_ID = #{projectId}
+        and customer_id = #{customerId}
     </delete>