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 { * @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 { * @param list * @return int */ - void deleteByProjectIds(@Param("list") List list); + void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List 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 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 delete from screen_project_data where PROJECT_ID = #{projectId} + AND customer_id = #{customerId} delete from screen_project_data - - + where 1=1 + AND customer_id = #{customerId} + PROJECT_ID = #{projectId} -