项目可见性问题
parent
72f3bd5157
commit
01fd773772
|
@ -9,8 +9,8 @@ import javax.persistence.*;
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "project_visiable")
|
@Table(name = "project_visible")
|
||||||
public class ProjectVisiable {
|
public class ProjectVisible {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
@ -3,5 +3,5 @@ package cn.palmte.work.model;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
public interface ProjectVisiableRepository extends JpaRepository<ProjectVisiable, Integer> {
|
public interface ProjectVisibleRepository extends JpaRepository<ProjectVisible, Integer> {
|
||||||
}
|
}
|
|
@ -96,7 +96,7 @@ public class ProjectService {
|
||||||
Admin admin = InterfaceUtil.getAdmin();
|
Admin admin = InterfaceUtil.getAdmin();
|
||||||
int roleId = admin.getRoleId();
|
int roleId = admin.getRoleId();
|
||||||
Integer adminId = admin.getId();
|
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;
|
return queryHelper;
|
||||||
|
|
Loading…
Reference in New Issue