1.0.5 update

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

@@ -49,16 +49,16 @@ public class DocManageServiceImpl implements DocManageService {
 
     @Override
     public IPage<DocManageResult> pageData(Long semesterId, Long examId, String courseCode, Integer pageNumber, Integer pageSize) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Set<Long> orgIds = libraryCommonService.listSubOrgIds(sysUser.getOrgId());
-        return docManageMapper.pageData(new Page<>(pageNumber, pageSize), semesterId, examId, courseCode, orgIds);
+//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+//        Set<Long> orgIds = libraryCommonService.listSubOrgIds(sysUser.getOrgId());
+        return docManageMapper.pageData(new Page<>(pageNumber, pageSize), semesterId, examId, courseCode, null);
     }
 
     @Override
     public DocManageStatResult statData(Long semesterId, Long examId, String courseCode) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Set<Long> orgIds = libraryCommonService.listSubOrgIds(sysUser.getOrgId());
-        return docManageMapper.statData(semesterId, examId, courseCode, orgIds);
+//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+//        Set<Long> orgIds = libraryCommonService.listSubOrgIds(sysUser.getOrgId());
+        return docManageMapper.statData(semesterId, examId, courseCode, null);
     }
 
     @Override

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

@@ -29,7 +29,7 @@
     <select id="statData" resultType="com.qmth.paper.library.business.bean.result.DocManageStatResult">
         SELECT
             count(distinct pst.course_code) courseCount,
-            count(1) pictureCount
+            count(pl.id) pictureCount
         FROM
             paper_scan_task pst
                 LEFT JOIN

paper-library/src/main/resources/db-log/xf.sql

@@ -45,7 +45,6 @@ CREATE TABLE `basic_batch_number` (
         `sequence` INT NULL COMMENT '序号',
         PRIMARY KEY (`exam_id`, `user_id`));
 
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('207', '获取批次号', '/api/admin/client/get_batch_number', 'URL', '200', '7', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('276', '删除图片', '/api/admin/paper/document/picture/delete', 'URL', '260', '8', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('277', '旋转保存图片', '/api/admin/paper/document/picture/save', 'URL', '260', '9', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `related` = '267,268,269,270,271,276,277' WHERE (`id` = '264');