From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2.java | 0
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 41 ++++++++++++++++++++++++++++++++++-------
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 2 +-
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 9da4636..83a7f6e 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -620,7 +620,7 @@
String imgO = orderTask.getImg();
orderTask.setImg(imgO+","+img);
}else{
- orderTask.setImg(","+img);
+ orderTask.setImg(img);
}
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
index aef2e16..8a795af 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -136,17 +136,44 @@
private List<OrderDetail> orderDetails;
public String getImg() {
- if (StrUtil.isEmpty(img)){
+ if (StrUtil.isEmpty(img)) {
return null;
}
- if (img.contains("http")){
- String temp = "";
- for (int i=0;i<img.split(",").length;i++){
- String url = img.split(",")[i];
- temp += "/xboot"+url.split("/xboot")[1]+",";
+ String temp = "";
+ String[] imgs = img.split(",");
+ for (int i = 0; i < imgs.length; i++) {
+ String url = imgs[i];
+ if (StrUtil.isNotEmpty(url)) {
+ if (url.contains("http") && url.contains("/xboot")) {
+ try{
+ if("".equals(temp)){
+ temp += "/xboot" + url.split("/xboot")[1];
+ }else{
+ temp += ",/xboot" + url.split("/xboot")[1];
+ }
+ }catch (Exception e){
+ if("".equals(temp)){
+ temp += url;
+ }else{
+ temp += "," + url;
+ }
+ }
+ } else {
+ if("".equals(temp)){
+ temp += url;
+ }else {
+ temp += "," + url;
+ }
+ }
}
- img = temp;
}
+ img = temp;
return img;
}
+ public static void main(String[] args) {
+ String img = ",,http://111.63.178.115:9091/xboot/file/view/1712990736426864641,,/xboot/file/view/1712990822305239041,,";
+ OrderTask o = new OrderTask();
+ o.setImg(img);
+ System.out.println(o.getImg());
+ }
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2.java
index 926fe06..aaf46aa 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask2.java
Binary files differ
--
Gitblit v1.9.1