Merge branch 'master' of http://121.41.40.202:3000/zhuwei/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileTaskController.java

@@ -171,7 +171,7 @@ public class ArchiveFileTaskController extends BladeController {
         int size = dto.getSize();
         //封装入参SQL
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND approval_type = 4"); //approval_type = 4 表示档案任务
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type = 4"); //approval_type = 4 表示档案任务
         if (ObjectUtil.isNotEmpty(dto.getTypeValue())) {
             sqlString.append(" AND type = ?");
             params.add(dto.getTypeValue());

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -905,7 +905,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
             outputStream.write(bytes);
 
             //设置PDF每页大小为A4，内容等比缩放，方向同步
-            PdfResizeTool.resizeToA4WithContentScaling(localPdf, localPdf);
+            //PdfResizeTool.resizeToA4WithContentScaling(localPdf, localPdf);
 
             //上传到OSS
             String absoluteFileName = FileUtils.getOssPath(OssConstant.ARCHIVE_DIRECTORY, fileName, projectId);

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1171,7 +1171,7 @@ public class TaskController extends BladeController {
         int size = dto.getSize();
         //封装入参SQL
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND approval_type != 4"); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type != 4"); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
         if (ObjectUtil.isNotEmpty(dto.getTypeValue())) {
             sqlString.append(" AND type = ?");
             params.add(dto.getTypeValue());