소스 검색

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

tangjiang 1 개월 전
부모
커밋
fda3f89ff8
1개의 변경된 파일11개의 추가작업 그리고 6개의 파일을 삭제
  1. 11 6
      src/Hotline.Repository.SqlSugar/File/FileRepository.cs

+ 11 - 6
src/Hotline.Repository.SqlSugar/File/FileRepository.cs

@@ -33,8 +33,9 @@ namespace Hotline.Repository.SqlSugar.File
 			foreach (var file in entities)
 			{
 				var names = file.FileName.Split(".");
-                file.Name = names[0];
-                file.Type = names[1];
+                //file.Name = names[0];
+                file.Type = names[names.Length-1];
+				file.Name = file.FileName.Replace("."+file.Type, "");
 				file.Key = id;
                 file.OrgName = _sessionContext.OrgName;
                 file.OrgId = _sessionContext.OrgId;
@@ -51,8 +52,10 @@ namespace Hotline.Repository.SqlSugar.File
 			foreach (var file in entities)
 			{
 				var names = file.FileName.Split(".");
-				file.Name = names[0];
-				file.Type = names[1];
+				//file.Name = names[0];
+				//file.Type = names[1];
+				file.Type = names[names.Length - 1];
+				file.Name = file.FileName.Replace("." + file.Type, "");
 				file.Key = id;
 				file.OrgName = _sessionContext.OrgName;
 				file.OrgId = _sessionContext.OrgId;
@@ -76,8 +79,10 @@ namespace Hotline.Repository.SqlSugar.File
 				if (string.IsNullOrEmpty(file.Path) || string.IsNullOrEmpty(file.AllPath))
 					throw UserFriendlyException.SameMessage("附件信息错误,请检查后重新上传附件!");
 				var names = file.FileName.Split(".");
-				file.Name = names[0];
-				file.Type = names[1];
+				//file.Name = names[0];
+				//file.Type = names[1];
+				file.Type = names[names.Length - 1];
+				file.Name = file.FileName.Replace("." + file.Type, "");
 				file.OrgName = _sessionContext.OrgName;
 				file.OrgId = _sessionContext.OrgId;
 				file.UserId = _sessionContext.UserId;