|
@@ -828,7 +828,7 @@ public class ApiController {
|
|
|
public R saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
|
|
|
Set<String> errorHash = new HashSet<>();
|
|
|
List<String> ducImgUrl = new ArrayList<>();
|
|
|
- List<String> all = null;
|
|
|
+ List<String> all = new ArrayList<>();
|
|
|
|
|
|
String draftKey = wmTaskContent.getDraftKey();
|
|
|
String taskTypeId = wmTaskContent.getTemp30();
|
|
@@ -842,7 +842,7 @@ public class ApiController {
|
|
|
try {
|
|
|
String fieldVal = (String) field.get(wmTaskContent);
|
|
|
|
|
|
- all = duplicateImage(fieldVal, id, errorHash, ducImgUrl);
|
|
|
+ all = duplicateImage(fieldVal, id, errorHash, ducImgUrl,all);
|
|
|
} catch (Exception ignored) {
|
|
|
}
|
|
|
|
|
@@ -875,9 +875,8 @@ public class ApiController {
|
|
|
return r;
|
|
|
}
|
|
|
|
|
|
- private List<String> duplicateImage(String contentValue, Integer userId, Set<String> errorHash, List<String> duplicateImageUrl) {
|
|
|
+ private List<String> duplicateImage(String contentValue, Integer userId, Set<String> errorHash, List<String> duplicateImageUrl,List<String> all) {
|
|
|
|
|
|
- List<String> all = new ArrayList<>();
|
|
|
|
|
|
if (contentValue.startsWith("/admin/sys-file/wmkj")) {
|
|
|
|