Merge remote-tracking branch 'origin/dev_v3.2.0' into dev_v3.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPrintPlanServiceImpl.java

@@ -179,22 +179,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         //1.根据userId，schoolId查出orgId(应该从requestUser 获取)
         Long schoolId = sysUser.getSchoolId();
-        Long orgId = sysUser.getOrgId();
 
         //2.根据orgId查询他的所有叶子id 并把这些id放入List<Long> ids
-        List<Long> orgIds;
-        if ((orgId == null || orgId == 0) && (schoolId == null || schoolId == 0)) {
-            // 超级管理员权限
-            orgIds = sysOrgService.list().stream().map(SysOrg::getId).collect(Collectors.toList());
-        } else if ((orgId == null || orgId == 0) && schoolId > 0) {
-            // 学校管理员权限
-            orgIds = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId)).stream().map(SysOrg::getId).collect(Collectors.toList());
-        } else {
-            // 普通权限
-            List<Long> ids = new ArrayList<>();
-            ids.add(orgId);
-            orgIds = this.dp(ids, schoolId, new ArrayList<>());
-        }
+        List<Long> orgIds = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId)).stream().map(SysOrg::getId).collect(Collectors.toList());
 
         //3.关联template和template_org表 查询出来orgIds所包含的所有模板并组装
         if (CollectionUtils.isEmpty(orgIds)) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -396,7 +396,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 //                ossUtil.ossUpload(dirName, htmlContent);
                 fileStoreUtil.ossUpload(dirName, htmlContent, fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
                 jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
-                jsonObject.put(SystemConstant.PATH, dirName);
+                jsonObject.put(SystemConstant.HTML_PATH, dirName);
                 String url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + dirName;
 //                File localHtmlFile = ossUtil.ossDownload(dirName, url);
                 File localHtmlFile = fileStoreUtil.ossDownload(dirName, url, fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
@@ -425,7 +425,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 pdfDirName = pdfDirName.replaceAll("\\\\", "/");
                 fileStoreUtil.ossUpload(pdfDirName, pdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(fileMd5)), fileStoreUtil.getUploadEnumByPath(pdfDirName).getFssType());
 //                localHtmlFile.delete();
-                jsonObject.put(SystemConstant.PDF_PATH, pdfDirName);
+                jsonObject.put(SystemConstant.PATH, pdfDirName);
                 // htmlMd5
                 jsonObject.put("htmlMd5", DigestUtils.md5Hex(new FileInputStream(localHtmlFile)));
                 jsonObject.put("pdfMd5", fileMd5);
@@ -437,7 +437,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 }
                 FileCopyUtils.copy(bytes, new File(stringJoiner.toString()));
                 jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
-                jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
+                jsonObject.put(SystemConstant.HTML_PATH, stringJoiner.toString());
                 String destUrl = finalFile.getPath().replaceAll(UploadFileEnum.HTML.name().toLowerCase(), UploadFileEnum.PDF.name().toLowerCase());
                 HtmlToPdfUtil.convert(finalFile.getPath(), destUrl, PageSizeEnum.A3);
                 File pdfFile = new File(destUrl);
@@ -449,7 +449,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 fileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFile));
                 localFileList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
 
-                jsonObject.put(SystemConstant.PDF_PATH, destUrl);
+                jsonObject.put(SystemConstant.PATH, destUrl);
                 jsonObject.put("htmlMd5", DigestUtils.md5Hex(new FileInputStream(finalFile)));
                 jsonObject.put("pdfMd5", fileMd5);
             }