Merge branch 'dev_bugfix_ljj' into dev

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

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,7 +63,7 @@ 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);
 
-    int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
+	int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
 }

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);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -168,8 +168,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())){

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">

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>