3.4.5 update-20250508，bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientUpgradeServiceImpl.java

@@ -21,6 +21,7 @@ import com.qmth.teachcloud.common.enums.clientpackage.ClientPackageEnum;
 import com.qmth.teachcloud.common.service.FileUploadService;
 import com.qmth.teachcloud.common.util.FileUtil;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
 
@@ -124,22 +126,30 @@ public class ClientUpgradeServiceImpl extends MppServiceImpl<ClientUpgradeMapper
                 clientUpgrade.setMainfestPath(JSON.toJSONString(mainfestPathVo));
                 // 上传app目录下文件
                 String app = "app";
-                for (MainfestApp mainfestApp : mainfest.getApp()) {
-                    // 上传
-                    uploadUpgradeZipFiles(version, build, zipReader, app, mainfestApp.getName(), updateSuffix, platform);
+                List<MainfestApp> mainfestAppList = mainfest.getApp();
+                if (CollectionUtils.isNotEmpty(mainfestAppList)) {
+                    for (MainfestApp mainfestApp : mainfestAppList) {
+                        // 上传
+                        uploadUpgradeZipFiles(version, build, zipReader, app, mainfestApp.getName(), updateSuffix, platform);
+                    }
                 }
                 // 上传script目录下文件
                 String script = "script";
                 MainfestScript mainfestScript = mainfest.getScript();
-                uploadUpgradeZipFiles(version, build, zipReader, script, mainfestScript.getBefore(), updateSuffix, platform);
-                uploadUpgradeZipFiles(version, build, zipReader, script, mainfestScript.getAfter(), updateSuffix, platform);
-                for (String includeFileName : mainfestScript.getIncludes()) {
-                    uploadUpgradeZipFiles(version, build, zipReader, script, includeFileName, updateSuffix, platform);
+                if (mainfestScript != null) {
+                    uploadUpgradeZipFiles(version, build, zipReader, script, mainfestScript.getBefore(), updateSuffix, platform);
+                    uploadUpgradeZipFiles(version, build, zipReader, script, mainfestScript.getAfter(), updateSuffix, platform);
+                    for (String includeFileName : mainfestScript.getIncludes()) {
+                        uploadUpgradeZipFiles(version, build, zipReader, script, includeFileName, updateSuffix, platform);
+                    }
                 }
                 // 上传data目录下文件
                 String data = "data";
-                for (String dataFileName : mainfest.getData()) {
-                    uploadUpgradeZipFiles(version, build, zipReader, data, dataFileName, updateSuffix, platform);
+                List<String> mainfestData = mainfest.getData();
+                if (mainfestData != null) {
+                    for (String dataFileName : mainfestData) {
+                        uploadUpgradeZipFiles(version, build, zipReader, data, dataFileName, updateSuffix, platform);
+                    }
                 }
                 clientUpgrade.setUpgradeUploadTime(System.currentTimeMillis());
             } else {