Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/python/PythonService.java

@@ -2670,7 +2670,10 @@ public class PythonService {
                     designSingleItem.getPriority(),
                     minioPath,
                     gradientString,
-                    designSingleItem.getMaskUrl()));
+                    /*designSingleItem.getMaskUrl()*/
+                    null
+            ));
+
         });
 
 

src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

@@ -508,12 +508,13 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         // 将标注后的mask上传到minio,并将minio地址传给python端
         // todo 如果当前design使用的仍是旧的mask 则置maskUrl为null
         // 1、查询当前design item在不在history中
-        UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
+/*        UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
         Boolean setNull = Boolean.FALSE;
         if (!Objects.isNull(userLikeDesign) && userLikeDesign.getConverted() == 0){
             setNull = Boolean.TRUE;
-        }
-        maskBase64ToPath(designSingleIncludeLayersDTO, setNull);
+        }*/
+//        maskBase64ToPath(designSingleIncludeLayersDTO, setNull);
+        maskBase64ToPath(designSingleIncludeLayersDTO, Boolean.TRUE);
 
         // 组装入参
         DesignPythonObjects objects = pythonService.covertDesignSingleParam(