diff --git a/src/main/java/cn/palmte/work/model/ProjectVisiable.java b/src/main/java/cn/palmte/work/model/ProjectVisible.java similarity index 85% rename from src/main/java/cn/palmte/work/model/ProjectVisiable.java rename to src/main/java/cn/palmte/work/model/ProjectVisible.java index b2efacb..a8c7fde 100644 --- a/src/main/java/cn/palmte/work/model/ProjectVisiable.java +++ b/src/main/java/cn/palmte/work/model/ProjectVisible.java @@ -9,8 +9,8 @@ import javax.persistence.*; */ @Data @Entity -@Table(name = "project_visiable") -public class ProjectVisiable { +@Table(name = "project_visible") +public class ProjectVisible { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/cn/palmte/work/model/ProjectVisiableRepository.java b/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java similarity index 51% rename from src/main/java/cn/palmte/work/model/ProjectVisiableRepository.java rename to src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java index c4fcf5a..8e75a76 100644 --- a/src/main/java/cn/palmte/work/model/ProjectVisiableRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java @@ -3,5 +3,5 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; -public interface ProjectVisiableRepository extends JpaRepository { +public interface ProjectVisibleRepository extends JpaRepository { } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index af8932f..e5bc5bc 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -96,7 +96,7 @@ public class ProjectService { Admin admin = InterfaceUtil.getAdmin(); int roleId = admin.getRoleId(); Integer adminId = admin.getId(); - queryHelper.addCondition("p.id in (SELECT pv.project_id FROM project_visiable pv WHERE pv.type=1 AND pv.tid=? UNION SELECT pv.project_id FROM project_visiable pv WHERE pv.type=2 AND pv.tid=?)", roleId, adminId); + queryHelper.addCondition("p.id in (SELECT pv1.project_id FROM project_visible pv1 WHERE pv1.type=1 AND pv1.tid=? UNION SELECT pv2.project_id FROM project_visible pv2 WHERE pv2.type=2 AND pv2.tid=?)", roleId, adminId); return queryHelper;