修复 Dao无法重载的问题

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java

@@ -24,7 +24,7 @@ import java.util.List;
 @SqlResource("jlw.teacherOpenCourseChatLog")
 public interface TeacherOpenCourseChatLogDao extends BaseMapper<TeacherOpenCourseChatLog>{
     PageQuery<TeacherOpenCourseChatLog> queryByCondition(PageQuery query);
-    PageQuery<TeacherOpenCourseChatLogTree> queryByCondition(PageQuery query, Boolean placeholder);
+    PageQuery<TeacherOpenCourseChatLogTree> queryByCondition2(PageQuery query);
     PageQuery<TeacherOpenCourseChatLog> queryByConditionQuery(PageQuery query);
     @Update
     void deleteTeacherOpenCourseChatLogByIds(String ids);

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java

@@ -40,10 +40,9 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper<TeacherO
     /**
      * 自己懒省事，搞的原始的TeacherOpenCourseQuestionSetting 被污染了。。
      * @param teacherOpenCourseQuestionSettingQuery     查询实体
-     * @param placeholder                               占位，随便传
      * @return
      */
-    List<TeacherOpenCourseQuestionSettingPure> getValuesByQueryNotWithPermission(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery, Boolean placeholder);
+    List<TeacherOpenCourseQuestionSettingPure> getValuesByQueryNotWithPermission2(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery);
 
     /**
      * 题目配置，统计分析接口

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -265,7 +265,7 @@ public class StatisticalAnalysisService {
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
 
-        List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionSettingQuery, null);
+        List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
         List<TeacherOpenCourseQuestionSettingPure> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList());
         data.put("subjectNum", collect1.size());
         //案例
@@ -334,7 +334,7 @@ public class StatisticalAnalysisService {
         teacherOpenCourseQuestionSettingQuery.setOrgId(uniOrgId);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
-        List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionSettingQuery, null);
+        List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
         List<Long> collect2 = courseQuestionSettings.stream()
                 .map(TeacherOpenCourseQuestionSettingPure::getTeacherOpenCourseQuestionSettingId).collect(Collectors.toList());
         List<QuestionLogSummary> select1 = questionLogSummaryDao.createLambdaQuery()

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java

@@ -69,7 +69,7 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService<TeacherOpen
         return ret;
     }
     public PageQuery<TeacherOpenCourseChatLogTree> queryByCondition(PageQuery query, Boolean placeholder){
-        PageQuery<TeacherOpenCourseChatLogTree> ret =  teacherOpenCourseChatLogDao.queryByCondition(query, placeholder);
+        PageQuery<TeacherOpenCourseChatLogTree> ret =  teacherOpenCourseChatLogDao.queryByCondition2(query);
         CollectionUtil.emptyIfNull(ret.getList()).forEach(item -> {
             String headImg = webPlatformService.getHeadImgByIdentity(item.getUserId());
             item.set("headImg", headImg);

web/src/main/java/com/ibeetl/jlw/web/TeacherController.java

@@ -185,7 +185,7 @@ public class TeacherController extends BaseController {
         view.addObject("universitiesCollegesName", null);
 
         ResourcesApplication resourcesApplication = new ResourcesApplication();
-        if(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())){//教师
+        if(!coreUser.isAdmin()){//教师
             UniversitiesColleges universitiesColleges = new UniversitiesColleges();
             universitiesColleges.setOrgId(coreUser.getOrgId());
             List<UniversitiesColleges> universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges);

web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md

@@ -117,6 +117,12 @@ queryByCondition
   @}
   @}
 
+queryByCondition2
+===
+* 根据不为空的参数进行分页查询
+ 
+  #use("queryByCondition")#
+
 
 queryByConditionQuery
 ===

web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md

@@ -571,15 +571,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(teacherOpenCourseQuestionSettingPushStatus)){
   and t.teacher_open_course_question_setting_push_status =#teacherOpenCourseQuestionSettingPushStatus#
   @}
-  @if(isEmpty(teacherOpenCourseQuestionSettingStatus) && isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
-  and t.teacher_open_course_question_setting_status != 2
-  @}else{
-  @if(!isEmpty(teacherOpenCourseQuestionSettingStatus)){
-  and t.teacher_open_course_question_setting_status =#teacherOpenCourseQuestionSettingStatus#
-  @}else if(!isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
+  @if(!isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
   and find_in_set(t.teacher_open_course_question_setting_status,#teacherOpenCourseQuestionSettingStatusPlural#)
   @}
-  @}
   @if(!isEmpty(teacherOpenCourseQuestionSettingAddTime)){
   and t.teacher_open_course_question_setting_add_time =#teacherOpenCourseQuestionSettingAddTime#
   @}
@@ -602,6 +596,14 @@ getValuesByQueryNotWithPermission
   and find_in_set(t.user_id,#userIdPlural#)
   @}
 
+
+getValuesByQueryNotWithPermission2
+===
+
+* 根据不为空的参数进行查询
+
+  #use("getValuesByQueryNotWithPermission")#
+
 analysisOld
 ===
 * 题目配置，统计分析接口