diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java index 2b408c6f..63139504 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java @@ -4,10 +4,6 @@ import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.*; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; import java.util.List; @@ -59,12 +55,6 @@ public class ProjectGroup extends Entity { /** * 关联的环境列表 */ -// @ManyToMany(cascade = CascadeType.REMOVE) -// @JoinTable( -// name = "deploy_project_group_environment", -// joinColumns = @JoinColumn(name = "project_group_id"), -// inverseJoinColumns = @JoinColumn(name = "environment_id") -// ) @ManyToMany @JoinTable( name = "deploy_project_group_environment", @@ -72,4 +62,5 @@ public class ProjectGroup extends Entity { inverseJoinColumns = @JoinColumn(name = "environment_id") ) private List environments; + } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java index de8ca68b..de757de6 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java @@ -131,8 +131,8 @@ public abstract class BaseServiceImpl, D extends BaseDTO, I protected void handleSoftDelete(BooleanBuilder builder, BaseQuery query) { if (query == null || query.getDeleted() == null) { Class entityClass = getEntityClass(); - LogicDelete softDelete = entityClass.getAnnotation(LogicDelete.class); - if (softDelete != null && softDelete.value()) { + LogicDelete logicDelete = entityClass.getAnnotation(LogicDelete.class); + if (logicDelete != null && logicDelete.value()) { Path deletedPath = EntityPathResolver.getPath(entityPath, "deleted"); if (deletedPath instanceof BooleanPath) { builder.and(((BooleanPath) deletedPath).eq(false));