富文本还原

src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java

@@ -114,7 +114,7 @@ public class BasicCorpExportLogController {
     @PostMapping("/udiwms/corps/importLog/export")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) {
-        String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".udi";
+        String fileName = "E:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".udi";
         BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity();
         corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -224,6 +224,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 break;
             case Constant.ORDER_ACTION_SUP_DELIVERY:
                 //允许送货单直接入库变更库存,则不判断送货单是否入库
+
                 String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock");
                 if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
                     bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()

src/main/java/com/glxp/api/upload/uploadController.java

@@ -126,6 +126,7 @@ public class uploadController {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
         }
         String newName = UUID.randomUUID() + fileType;//生成新文件名
+//        String savePath = filePath + "/register/file/" + type;
         String savePath = filePath + "/register/file/" + type;
         String savePath1 = fileLpath + "?type=" + type;
         String fileFullName = savePath + "/" + newName;
@@ -140,7 +141,8 @@ public class uploadController {
 //            MinioUtil.uploadFile(fileFullName, file);
             Map<String, String> rMap = new HashMap<>();
             rMap.put("msg", "上传成功");
-            rMap.put("name", fileUrl + savePath1 + "&name=" + newName);
+//            rMap.put("name", fileUrl + savePath1 + "&name=" + newName);
+            rMap.put("name", newName);
             rMap.put("type", type);
             return ResultVOUtils.success(rMap);
         } catch (Exception e) {