LEIYI 7 mēneši atpakaļ
vecāks
revīzija
a4e1aab33b

+ 24 - 20
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2909,34 +2909,38 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             //D:\FTP\File\OA2023\Office\GrpFile\TranslatorLibrary
             var fileBasePath = $"{AppSettingsHelper.Get("GrpFileBasePath")}TranslatorLibrary";
             #region 保存文件
-            foreach (var item in dto.Files)
+            if (dto.Files != null)
             {
-                if (item.Length < 1) continue;
 
-                if (!System.IO.Directory.Exists(fileBasePath))
+                foreach (var item in dto.Files)
                 {
-                    System.IO.Directory.CreateDirectory(fileBasePath);
-                }
+                    if (item.Length < 1) continue;
 
-                var file = item;
+                    if (!System.IO.Directory.Exists(fileBasePath))
+                    {
+                        System.IO.Directory.CreateDirectory(fileBasePath);
+                    }
 
-                // 将文件保存到指定位置
-                var filePath = Path.Combine(fileBasePath, file.FileName);
-                using (var stream = new FileStream(filePath, FileMode.Create))
-                {
-                    await file.CopyToAsync(stream);
-                }
+                    var file = item;
 
-                //验证文件是否上传成功
-                if (!System.IO.File.Exists(filePath))
-                {
-                    foreach (var filePathStr in fileNames)
+                    // 将文件保存到指定位置
+                    var filePath = Path.Combine(fileBasePath, file.FileName);
+                    using (var stream = new FileStream(filePath, FileMode.Create))
                     {
-                        System.IO.File.Delete(Path.Combine(fileBasePath, filePathStr));
+                        await file.CopyToAsync(stream);
+                    }
+
+                    //验证文件是否上传成功
+                    if (!System.IO.File.Exists(filePath))
+                    {
+                        foreach (var filePathStr in fileNames)
+                        {
+                            System.IO.File.Delete(Path.Combine(fileBasePath, filePathStr));
+                        }
+                        return Ok(JsonView(false, "文件上传失败!"));
                     }
-                    return Ok(JsonView(false, "文件上传失败!"));
+                    fileNames.Add(file.FileName);
                 }
-                fileNames.Add(file.FileName);
             }
 
             #endregion
@@ -3000,7 +3004,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                         Files = translatorInfo.Files,
                     });
 
-                if (upd) Ok(JsonView(true));
+                if (upd) return Ok(JsonView(true));
             }
 
             return Ok(JsonView(false));

+ 12 - 12
OASystem/OASystem.Domain/Entities/Resource/Res_TranslatorLibrary.cs

@@ -15,74 +15,74 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 所在地区
         /// </summary>
-        [SugarColumn(ColumnDescription = "所在地区", IsNullable = false, ColumnDataType = "nvarchar(100)")]
+        [SugarColumn(ColumnDescription = "所在地区", IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string Area { get; set; }
 
         /// <summary>
         /// 姓名
         /// </summary>
-        [SugarColumn(ColumnDescription = "翻译人员姓名", IsNullable = false, ColumnDataType = "nvarchar(100)")]
+        [SugarColumn(ColumnDescription = "翻译人员姓名", IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string Name { get; set; }
 
         /// <summary>
         /// 性别(0:未设置 1:男 2:女)
         /// </summary>
-        [SugarColumn(ColumnDescription = "性别(0:未设置 1:男 2:女)", IsNullable = false, ColumnDataType = "int")]
+        [SugarColumn(ColumnDescription = "性别(0:未设置 1:男 2:女)", IsNullable = true, ColumnDataType = "int")]
         public int Sex { get; set; }
 
         /// <summary>
         /// 照片
         /// </summary>
-        [SugarColumn(ColumnDescription = "照片", IsNullable = false, ColumnDataType = "nvarchar(max)")]
+        [SugarColumn(ColumnDescription = "照片", IsNullable = true, ColumnDataType = "nvarchar(max)")]
         public string Photo { get; set; }
 
 
         /// <summary>
         /// 联系电话
         /// </summary>
-        [SugarColumn(ColumnDescription = "联系电话", IsNullable = false, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "联系电话", IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Tel { get; set; }
 
         /// <summary>
         /// 邮箱号
         /// </summary>
-        [SugarColumn(ColumnDescription = "邮箱号", IsNullable = false, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "邮箱号", IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Email { get; set; }
 
         /// <summary>
         /// 微信号
         /// </summary>
-        [SugarColumn(ColumnDescription = "微信号", IsNullable = false, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "微信号", IsNullable = true, ColumnDataType = "varchar(50)")]
         public string WechatNo { get; set; }
 
         /// <summary>
         /// 其他社交账号
         /// </summary>
-        [SugarColumn(ColumnDescription = "其他社交账号", IsNullable = false, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "其他社交账号", IsNullable = true, ColumnDataType = "varchar(50)")]
         public string OtherSocialAccounts { get; set; }
 
         /// <summary>
         /// 语种
         /// </summary>
-        [SugarColumn(ColumnDescription = "语种", IsNullable = false, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "语种", IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Language { get; set; }
 
         /// <summary>
         /// 费用
         /// </summary>
-        [SugarColumn(ColumnDescription = "费用", IsNullable = false, ColumnDataType = "decimal(10,2)")]
+        [SugarColumn(ColumnDescription = "费用", IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Price { get; set; }
 
         /// <summary>
         /// 币种
         /// </summary>
-        [SugarColumn(ColumnDescription = "语种", IsNullable = false, ColumnDataType = "int")]
+        [SugarColumn(ColumnDescription = "语种", IsNullable = true, ColumnDataType = "int")]
         public int Currency { get; set; }
 
         /// <summary>
         /// 简历或其他证书
         /// </summary>
-        [SugarColumn(ColumnDescription = "简历或其他证书", IsNullable = false, ColumnDataType = "varchar(200)")]
+        [SugarColumn(ColumnDescription = "简历或其他证书", IsNullable = true, ColumnDataType = "varchar(200)")]
         public string Files { get; set; }
 
     }