Merge pull request edp963#2156 from yeyuezhishou/dev-0.3

perft:删除应用关联角色接口-报错优化
hangzhi7 · Mar 3, 2021 · 6fbe852 · 6fbe852
2 parents 963ec8f + 3689060
commit 6fbe852
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleDashboardMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleDashboardMapper.java
@@ -90,5 +90,5 @@ public interface RelRoleDashboardMapper {
         "select d.id from dashboard d left join dashboard_portal p on p.id = d.dashboard_portal_id ",
         "where p.project_id = #{projectId})"
     })
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleDashboardWidgetMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleDashboardWidgetMapper.java
@@ -83,6 +83,6 @@ public interface RelRoleDashboardWidgetMapper {
             "INNER JOIN dashboard_portal dp ON dp.id = d.dashboard_portal_id " +
             "WHERE dp.project_id = #{projectId} " +
             ") "})
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleDisplayMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleDisplayMapper.java
@@ -78,5 +78,5 @@ public interface RelRoleDisplayMapper {
     int deleteByProject(Long projectId);
 
     @Delete({"delete from rel_role_display where role_id = #{roleId} and display_id in (select id from display where project_id = #{projectId})"})
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleDisplaySlideWidgetMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleDisplaySlideWidgetMapper.java
@@ -84,7 +84,7 @@ public interface RelRoleDisplaySlideWidgetMapper {
         "INNER JOIN display d ON d.id = ds.display_id " +
         "WHERE d.project_id = #{projectId} " +
         ") "})
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 
     int copyRoleSlideWidgetRelation(@Param("relSlideCopies") List<RelModelCopy> memCopies, @Param("userId") Long userId);
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRolePortalMapper.java b/server/src/main/java/edp/davinci/dao/RelRolePortalMapper.java
@@ -69,5 +69,5 @@ public interface RelRolePortalMapper {
     int deleteByProject(Long projectId);
 
     @Delete({"delete from rel_role_portal where role_id = #{roleId} and portal_id in (select id from dashboard_portal where project_id = #{projectId})"})
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleSlideMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleSlideMapper.java
@@ -92,5 +92,5 @@ public interface RelRoleSlideMapper {
         "left join display d on d.id = ds.display_id ",
         "where d.project_id = #{projectId})"
     })
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleViewMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleViewMapper.java
@@ -81,5 +81,5 @@ public interface RelRoleViewMapper {
     @Delete({ 
             "delete from rel_role_view where role_id = #{roleId} and view_id in (select id from view where project_id = #{projectId})" 
     })
-    int deleteByRoleAndProject(Long roleId, Long projectId);
+    int deleteByRoleAndProject(@Param("roleId") Long roleId, @Param("projectId") Long projectId);
 }