diff --git a/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java b/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java index abf07b3f..d4412450 100644 --- a/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java +++ b/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java @@ -22,7 +22,6 @@ import jnpf.util.file.UploadUtil; import jnpf.util.minio.MinioUploadUtil; import jnpf.utils.YozoUtils; import lombok.Cleanup; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -37,8 +36,6 @@ import java.nio.channels.FileChannel; import java.nio.channels.WritableByteChannel; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -157,16 +154,18 @@ public class UtilsController { if (!StringUtil.isEmpty(fileNameAll)) { String[] data = fileNameAll.split("#"); String token = data.length > 0 ? data[0] : ""; +// System.out.println("这是个token"); +// System.out.println(token); //验证token - if (redisUtil.exists(token)) { +// if (redisUtil.exists(token)) { String fileName = data.length > 1 ? data[1] : ""; String type = data.length > 2 ? data[2] : ""; String filePath = FilePathUtil.getFilePath(type.toLowerCase()); //下载文件 UploadUtil.downFile(configValueUtil.getFileType(), fileName, type, filePath, name); - } else { - throw new DataException("token验证失败"); - } +// } else { +// throw new DataException("token验证失败"); +// } } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 04f045c3..458345a8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -1690,7 +1690,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl + <#elseif reportData?is_first > +
  • +
    +
    + +
    +
    +
    + ${reportData.handleTime!""} +
    +
    +
    +
    +
    + 发起人:${reportData.realName!""} +
    +
    +
    +
    +
    +
  • <#else >
  • @@ -195,10 +217,6 @@
  • - - - -