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

2025-06-16 13:45:25 +08:00
parent 3db0a94981 891b26d493
commit 774a20257d
1 changed files with 2 additions and 1 deletions
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -2024,7 +2024,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
    private String resolveModelType(String taskId){
        // 判断当前task来自哪个模型
        Generate generate = selectByUniqueId(taskId);
-        if (!StringUtil.isNullOrEmpty(generate.getModelName()) &&
+        if (Objects.nonNull(generate) &&
+                !StringUtil.isNullOrEmpty(generate.getModelName()) &&
                (generate.getModelName().equals("wx")
                        || generate.getModelName().equals("freepik")
                        || generate.getModelName().equals("flux") )){