BUG

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

@@ -225,9 +225,10 @@ public class ArchiveFileController extends BladeController {
 
 				}
 			}
+			return R.data(true);
 		}
 
-		return R.data(true);
+		return R.data(false);
 	}
 
 	/**

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

@@ -21,6 +21,7 @@ import org.springblade.business.service.ImageClassificationShowService;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.vo.ImageClassificationShowVO;
 import org.springblade.business.vo.TreeVo;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.common.vo.DataVO;
@@ -43,6 +44,7 @@ import org.springblade.manager.vo.WbsTreeContractTreeVOS;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.resource.vo.NewBladeFile;
+import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.Dict;
 import org.springblade.system.feign.IDictClient;
 import org.springframework.beans.BeanUtils;
@@ -131,6 +133,9 @@ public class ImageClassificationFileController extends BladeController {
 		//获取固定表格
 		ExcelTab excelTab = this.excelTabClient.getById("1550363881879781377");
 
+		//获取配置的路径
+		String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+
 		List<String> result = new ArrayList<>();
 		if(excelTab != null){
 			//获取数据
@@ -200,7 +205,7 @@ public class ImageClassificationFileController extends BladeController {
 										}
 									}
 
-									String locationFile = "/Users/hongchuangyanfa/Desktop/print/" + SnowFlakeUtil.getId() + ".xlsx";//
+									String locationFile = file_path + "/print//" + SnowFlakeUtil.getId() + ".xlsx";
 									outputStream = new FileOutputStream(locationFile);
 									//记录文件删除
 									removeList.add(locationFile);

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

@@ -21,6 +21,7 @@ import org.springblade.business.service.IConstructionLedgerService;
 import org.springblade.business.service.IInformationQueryFileService;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.vo.*;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.mp.support.Condition;
@@ -39,6 +40,7 @@ import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.feign.WbsTreePrivateClient;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
 import org.springblade.resource.feign.NewIOSSClient;
+import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.beans.BeanUtils;
@@ -519,6 +521,9 @@ public class InformationWriteQueryController extends BladeController {
 		//pdf集合
 		List<String> pdfList = new ArrayList<>();
 
+		//获取配置的路径
+		String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+
     	for(InformationQuery query : queries){
     		switch (query.getType()){
 				case 1:
@@ -545,7 +550,7 @@ public class InformationWriteQueryController extends BladeController {
 		pdfList.removeIf(StringUtils::isEmpty);
 
     	//执行合并
-		String mergeName = SnowFlakeUtil.getId() + ".pdf", mergeUrl = "/Users/hongchuangyanfa/Desktop/print/" + mergeName;
+		String mergeName = SnowFlakeUtil.getId() + ".pdf", mergeUrl = file_path + "/print//" + mergeName;
 		FileUtils.mergePdfPublicMethods(pdfList, mergeUrl);
 
 		//上传

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TaskMapper.xml

@@ -40,7 +40,7 @@
           batch,
           project_id,
           contract_id
-        from u_task where form_data_id like #{formDataId} and status in(1,2) and is_deleted = 0 order by create_time DESC limit 1
+        from u_task where form_data_id like concat('%',#{formDataId},'%') and status in(1,2) and is_deleted = 0 order by create_time DESC limit 1
     </select>
 
     <select id="queryBatchList" resultMap="taskResultMap">