task or修改

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/TBTaskMapper.java

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.common.mapper;
 
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
@@ -20,7 +19,6 @@ import java.util.Map;
  */
 public interface TBTaskMapper extends BaseMapper<TBTask> {
 
-    @InterceptorIgnore(tenantLine = "true")
     public IPage<TaskListResult> query(IPage<Map> iPage,
                                        @Param("schoolId") Long schoolId,
                                        @Param("printPlanId") Long printPlanId,

teachcloud-common/src/main/resources/mapper/TBTaskMapper.xml

@@ -14,7 +14,7 @@
             tbt.create_id as createId,
             su.real_name as createName,
             if(ISNULL(tbt.import_file_path),false,true) as hasImportFile,
-            if(ISNULL(tbt.result_file_path),false,true) or if(ISNULL(tbt.import_file_path),false,true) as hasResultFile,
+            IF(tbt.result_file_path is null, IF(tbt.import_file_path is null, false, true), true) as hasResultFile,
             if(ISNULL(tbt.report_file_path),false,true) as hasReportFile,
             if(ISNULL(tbt.error_file_path),false,true) as hasErrorFile,
             tbt.reset_count as resetCount,