LEIYI 4 months ago
parent
commit
333cfa5aae

+ 8 - 3
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2900,7 +2900,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         public async Task<IActionResult> TranslatorLibraryOp([FromForm]TranslatorLibraryOpDto dto)
         {
             if (dto.PortType < 1 || dto.PortType > 3) return Ok(JsonView(false, MsgTips.Port));
-            if (dto.OpStatus < 1 || dto.OpStatus > 2) return Ok(JsonView(false, MsgTips.Status));
+            if (dto.Status < 1 || dto.Status > 2) return Ok(JsonView(false, MsgTips.Status));
 
             var currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
             if (currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
@@ -2952,8 +2952,13 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             #endregion
 
 
-            if (dto.OpStatus == 1)
+            if (dto.Status == 1)
             {
+                //验证重复
+                var info = await _translatorRep.Query(x => x.Area.Equals(dto.Area) && x.Name.Equals(dto.Name)).FirstAsync();
+                if (info != null) return Ok(JsonView(false, "该条数据已存在!"));
+
+
                 translatorInfo.CreateUserId = currUserInfo.UserId;
                 if (fileNames.Count > 0)
                 {
@@ -2963,7 +2968,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 var add = await _translatorRep.AddAsync(translatorInfo);
                 if (add > 0) return Ok(JsonView(true));
             }
-            else if (dto.OpStatus == 2)
+            else if (dto.Status == 2)
             {
                 var info = await _translatorRep.Query(x => x.Id == dto.Id).FirstAsync();
                 if (info != null)

+ 1 - 1
OASystem/OASystem.Domain/Dtos/Resource/TranslatorLibraryDto.cs

@@ -23,7 +23,7 @@ namespace OASystem.Domain.Dtos.Resource
         /// 1 添加
         /// 2 编辑
         /// </summary>
-        public int OpStatus { get; set; }
+        public int Status { get; set; }
 
         public int Id { get; set; }
 

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

@@ -58,7 +58,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 其他社交账号
         /// </summary>
-        [SugarColumn(ColumnDescription = "其他社交账号", IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(ColumnDescription = "其他社交账号", IsNullable = true, ColumnDataType = "varchar(200)")]
         public string OtherSocialAccounts { get; set; }
 
         /// <summary>