Merge branch 'xgh_内容中台' into 'developer'

上传

See merge request !447

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

@@ -91,7 +91,11 @@ public class UploadController extends WebBaseController {
                 EnterpriseDTO enterprise = this.enterpriseService.getEnterpriseById(enterpriseId) ;
                 File file = File.createTempFile("tmp", null);
                 mf.transferTo(file);
-                CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(file, fileName, type, enterprise.getFactoryCode(), CloudFileBusinessOptEnum.COMMON, 7*24L) ;
+                String factoryCode = "";
+                if(null != enterprise) {
+                    factoryCode= enterprise.getFactoryCode() ;
+                }
+                CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(file, fileName, type, factoryCode , CloudFileBusinessOptEnum.COMMON, 7*24L) ;
                 if (uploadInfo != null) {
                     map.put("qcloudImageUrl", uploadInfo.getOrgFileUrl());
                 }