diff --git a/src/main/java/com/msdw/tms/TmsApplication.java b/src/main/java/com/msdw/tms/TmsApplication.java index 1e5e101..e2715d0 100644 --- a/src/main/java/com/msdw/tms/TmsApplication.java +++ b/src/main/java/com/msdw/tms/TmsApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.scheduling.annotation.EnableScheduling; -//@EnableScheduling//定时任务 +@EnableScheduling//定时任务 @SpringBootApplication public class TmsApplication extends SpringBootServletInitializer { diff --git a/src/main/java/com/msdw/tms/entity/ResultsEntity.java b/src/main/java/com/msdw/tms/entity/ResultsEntity.java index 653355a..f52b044 100644 --- a/src/main/java/com/msdw/tms/entity/ResultsEntity.java +++ b/src/main/java/com/msdw/tms/entity/ResultsEntity.java @@ -51,7 +51,4 @@ public class ResultsEntity{ //是否删除 private Integer isdel; - //是否隐藏项目实体类 - private ProjectHiddenEntity projectHiddenEntity; - } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index b21b766..958d62c 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -100,9 +100,6 @@ public class AchievementManagementServiceImpl extends ServiceImpland hpm.projectName like concat('%',#{searchContant},'%') and hpm.creationTime between @@ -500,8 +502,11 @@ FROM tms_experimental_teaching et inner join hr_project_management pm on et.project_id = pm.projectId + LEFT JOIN + tms_project_hidden tph on et.id = tph.teach_id WHERE user_id = #{userId} + AND tph.is_hidden is NULL /*AND pm.isdel = 0*/ and et.experimental_class_name like concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or