xiaofei 1 gadu atpakaļ
vecāks
revīzija
4b4ea4ebfb

+ 6 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -424,7 +424,9 @@ public class SysAdminSetController {
         SysConfigResult sysConfigResult = new SysConfigResult();
         if (sysConfig != null) {
             sysConfigResult = new SysConfigResult(sysConfig);
-            sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+            if (sysConfigResult != null && sysConfigResult.getValue() != null) {
+                sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+            }
         }
         return ResultUtil.ok(sysConfigResult);
     }
@@ -444,7 +446,9 @@ public class SysAdminSetController {
             commonCacheService.updateSysConfigCache(schoolId, sysConfig.getConfigKey());
         }
         SysConfigResult sysConfigResult = new SysConfigResult(sysConfig);
-        sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+        if (sysConfigResult != null && sysConfigResult.getValue() != null) {
+            sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+        }
         return ResultUtil.ok(sysConfigResult);
     }
 }

+ 1 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/FileUploadServiceImpl.java

@@ -318,7 +318,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             return null;
         }
         BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
-        if (basicAttachment == null && StringUtils.isBlank(basicAttachment.getPath())) {
+        if (basicAttachment == null || StringUtils.isBlank(basicAttachment.getPath())) {
             return null;
         }
         return filePreview(basicAttachment.getPath());