소스 검색

【BUG】修改导出接口上传文件异常

ZhaoMn 3 년 전
부모
커밋
d34a4557fe

+ 0 - 2
railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecQcodeController.java

@@ -77,7 +77,6 @@ public class SecQcodeController extends BaseController {
 
   @ApiOperation(value = "批量导出二维码")
   @Log(title = "批量导出二维码", businessType = BusinessType.EXPORT)
-  @PreAuthorize("@ss.hasPermi('system:dict:export')")
   @GetMapping("/export/{id}")
   public AjaxResult export(@PathVariable(value = "id") Long[] ids) {
     return baseSafetyToolService.export(ids);
@@ -85,7 +84,6 @@ public class SecQcodeController extends BaseController {
 
   @ApiOperation(value = "批量导出二维码")
   @Log(title = "批量导出二维码", businessType = BusinessType.EXPORT)
-  @PreAuthorize("@ss.hasPermi('system:dict:export')")
   @GetMapping("/exportAll")
   public AjaxResult exportAll(BaseSafetyTool safetyTool) {
     return baseSafetyToolService.export(safetyTool);

+ 2 - 1
railway-business/src/main/java/com/railway/business/safetool/service/impl/BaseSafetyToolServiceImpl.java

@@ -183,7 +183,8 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     } catch (ZipException e) {
       return AjaxResult.error("文件压缩失败");
     }
-    return sysFileService.uploadFile(zipFile);
+    String zipFilePath = localFilePath + "/" + zipFile;
+    return sysFileService.uploadFile(zipFilePath);
   }
 
   private void setTool(BaseSafetyTool tool){

+ 1 - 1
railway-business/src/main/resources/mapper/safetool/BaseSafetyToolMapper.xml

@@ -418,7 +418,7 @@
     'tool_type')
     LEFT JOIN sys_dict_data dict2 ON (t.test_cycle = dict2.dict_value AND dict2.dict_type =
     'test_cycle')
-    where t.id in
+    where t.tool_id in
     <foreach collection="array" item="id" open="(" separator="," close=")">
       #{id}
     </foreach>