测试bug修改

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesMapper.java

@@ -10,6 +10,7 @@ import com.qmth.paper.library.business.entity.PaperArchives;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -18,7 +19,7 @@ import java.util.List;
  */
 public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
-    IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName);
+    IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName, @Param("orgIds") Set<Long> orgIds);
 
     PaperArchives selectByArchivesName(@Param("schoolId") Long schoolId, @Param("archivesName") String archivesName);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesServiceImpl.java

@@ -16,10 +16,13 @@ import com.qmth.paper.library.business.service.PaperLibraryService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import com.qmth.paper.library.common.bean.params.DownLoadPaperParams;
 import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.enums.RoleTypeEnum;
+import com.qmth.paper.library.common.service.LibraryCommonService;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,6 +30,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +47,15 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
     @Resource
     PaperLibraryService paperLibraryService;
 
+    @Resource
+    LibraryCommonService libraryCommonService;
+
     @Override
     public IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), schoolId, semesterId, managerOrgId, archivesTypeId, archivesName);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Set<Long> orgIds = libraryCommonService.listSubOrgIds(sysUser.getOrgId());
+        return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), schoolId, semesterId, managerOrgId, archivesTypeId, archivesName, orgIds);
     }
 
     @Override
@@ -161,7 +170,7 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
             String courseName = downLoadPaperParams.getCourseName();
             String teacherName = downLoadPaperParams.getTeacherName();
             String teachClazzName = downLoadPaperParams.getTeachClazzName();
-            Boolean isBind = downLoadPaperParams.getBind();
+            Boolean isBind = downLoadPaperParams.getIsBind() == 1;
             String param = downLoadPaperParams.getParam();
             paperArchivesDetailResults = this.baseMapper.pageDetail(paperArchivesId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param);
         }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java

@@ -259,7 +259,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
             throw ExceptionResultEnum.ERROR.exception("扫描任务不存在");
         }
         paperScanTask.setScanUserId(null);
-        paperScanTask.setEnable(true);
+        paperScanTask.setEnable(false);
         paperScanTask.updateInfo(requestUser.getId());
         this.updateById(paperScanTask);
     }

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -295,7 +295,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         .lambda()
                         .eq(PaperScanTaskDetail::getPaperScanTaskId, paperScanTaskId));
                 paperScanTask.setStudentCount(studentCount);
-                paperScanTask.setEnable(true);
+                paperScanTask.setEnable(false);
             }
             paperScanTaskService.saveOrUpdateBatch(paperScanTaskList);
         }

paper-library-business/src/main/resources/mapper/PaperArchivesMapper.xml

@@ -67,6 +67,12 @@
             <if test="archivesName != null and archivesName != ''">
                 and pa.archives_name like concat('%',#{archivesName},'%')
             </if>
+            <if test="managerOrgId == null and orgIds != null and orgIds.size > 0">
+                AND pa.manager_org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectByArchivesName" resultMap="BaseResultMap">

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/DownLoadPaperParams.java

@@ -35,7 +35,7 @@ public class DownLoadPaperParams implements Serializable {
     String teachClazzName;
 
     @ApiModelProperty(value = "是否绑定")
-    Boolean isBind;
+    Integer isBind;
 
     @ApiModelProperty(value = "模糊查询（姓名/学号）")
     String param;
@@ -99,12 +99,12 @@ public class DownLoadPaperParams implements Serializable {
         this.teachClazzName = teachClazzName;
     }
 
-    public Boolean getBind() {
+    public Integer getIsBind() {
         return isBind;
     }
 
-    public void setBind(Boolean bind) {
-        isBind = bind;
+    public void setIsBind(Integer isBind) {
+        this.isBind = isBind;
     }
 
     public String getParam() {