+2

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2139,7 +2139,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                            {
                                DeleteUserId = dto.DeleteUserId,
                                DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                               IsDel = 1
+                               IsDel = 1,
+                               Remark = $"公务出访-->删除"
                            })
                            .Where(x => x.OfficialDutyId == dto.Id)
                            .ExecuteCommandAsync();
@@ -2979,22 +2980,25 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 if (id > 0) {
 
                     #region 新增(公务信息关联翻译人员) 关联信息
-                    var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
-                    foreach (var officialDutyId in dto.officialDutyIdItem)
+
+                    if (dto.officialDutyIdItem != null && dto.officialDutyIdItem.Length > 0)
                     {
-                        officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                        var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
+                        foreach (var officialDutyId in dto.officialDutyIdItem)
                         {
-                            TranslatorId = id,
-                            OfficialDutyId = officialDutyId,
-                            CreateUserId = currUserInfo.UserId,
-                            Remark = $"翻译人员库-->添加"
-                        });
-                    }
-                    if (officialDutyLinkTranslators.Count > 0)
-                    {
-                        await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                            officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                            {
+                                TranslatorId = id,
+                                OfficialDutyId = officialDutyId,
+                                CreateUserId = currUserInfo.UserId,
+                                Remark = $"翻译人员库-->添加"
+                            });
+                        }
+                        if (officialDutyLinkTranslators.Count > 0)
+                        {
+                            await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                        }
                     }
-
                     #endregion
                     _sqlSugar.CommitTran();
                     return Ok(JsonView(true));
@@ -3057,29 +3061,34 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                             {
                                 DeleteUserId = currUserInfo.UserId,
                                 DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                                IsDel = 1
+                                IsDel = 1,
+                                Remark = $"翻译人员库-->删除"
                             })
                             .Where(x => officialDutyLinkTranslatorIds.Contains(x.Id))
                             .ExecuteCommandAsync();
                     }
 
-                    //添加
-                    var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
-                    foreach (var officialDutyId in dto.officialDutyIdItem)
+
+                    if (dto.officialDutyIdItem != null && dto.officialDutyIdItem.Length > 0)
                     {
-                        officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                        //添加
+                        var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
+                        foreach (var officialDutyId in dto.officialDutyIdItem)
                         {
-                            TranslatorId = dto.Id,
-                            OfficialDutyId = officialDutyId,
-                            CreateUserId = currUserInfo.UserId,
-                            Remark = $"翻译人员库-->更新"
-                        });
-                    }
-                    if (officialDutyLinkTranslators.Count > 0)
-                    {
-                        await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                            officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                            {
+                                TranslatorId = dto.Id,
+                                OfficialDutyId = officialDutyId,
+                                CreateUserId = currUserInfo.UserId,
+                                Remark = $"翻译人员库-->更新"
+                            });
+                        }
+                        if (officialDutyLinkTranslators.Count > 0)
+                        {
+                            await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                        }
                     }
-
+                   
                     #endregion
                     _sqlSugar.CommitTran();
                     return Ok(JsonView(true));
@@ -3117,7 +3126,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                            .SetColumns(x => new Grp_OfficialDutyLinkTranslator() { 
                                DeleteUserId = currUserInfo.UserId, 
                                DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), 
-                               IsDel = 1
+                               IsDel = 1,
+                               Remark = $"翻译人员库-->删除"
                            })
                            .Where(x => x.TranslatorId == id)
                            .ExecuteCommandAsync();

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -240,21 +240,25 @@ FROM
                     else
                     {
                         #region 新增(公务信息关联翻译人员) 关联信息
-                        var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
-                        foreach (var translatorId in dto.TranslatorIdItem)
-                        {
-                            officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator() {
-                                TranslatorId = translatorId,
-                                OfficialDutyId = id,
-                                CreateUserId = dto.CreateUserId,
-                                Remark = $"公务出访客户资料-->添加"
-                            });
-                        }
-                        if (officialDutyLinkTranslators.Count > 0)
+
+                        if (dto.TranslatorIdItem != null && dto.TranslatorIdItem.Length > 0)
                         {
-                            await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                            var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
+                            foreach (var translatorId in dto.TranslatorIdItem)
+                            {
+                                officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                                {
+                                    TranslatorId = translatorId,
+                                    OfficialDutyId = id,
+                                    CreateUserId = dto.CreateUserId,
+                                    Remark = $"公务出访客户资料-->添加"
+                                });
+                            }
+                            if (officialDutyLinkTranslators.Count > 0)
+                            {
+                                await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                            }
                         }
-
                         #endregion
 
 
@@ -313,31 +317,34 @@ FROM
                             {
                                 DeleteUserId = dto.CreateUserId,
                                 DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                                IsDel = 1
+                                IsDel = 1,
+                                Remark = $"公务出访客户资料-->删除"
                             })
                             .Where(x => officialDutyLinkTranslatorIds.Contains(x.Id))
                             .ExecuteCommandAsync();
                     }
 
                     //添加
-                    var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
-                    foreach (var translatorId in dto.TranslatorIdItem)
+                    if (dto.TranslatorIdItem != null && dto.TranslatorIdItem.Length > 0)
                     {
-                        officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                        var officialDutyLinkTranslators = new List<Grp_OfficialDutyLinkTranslator>();
+                        foreach (var translatorId in dto.TranslatorIdItem)
                         {
-                            TranslatorId = translatorId,
-                            OfficialDutyId = dto.Id,
-                            CreateUserId = dto.CreateUserId,
-                            Remark = $"公务出访客户资料-->更新"
-                        });
-                    }
-                    if (officialDutyLinkTranslators.Count > 0)
-                    {
-                        await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                            officialDutyLinkTranslators.Add(new Grp_OfficialDutyLinkTranslator()
+                            {
+                                TranslatorId = translatorId,
+                                OfficialDutyId = dto.Id,
+                                CreateUserId = dto.CreateUserId,
+                                Remark = $"公务出访客户资料-->更新"
+                            });
+                        }
+                        if (officialDutyLinkTranslators.Count > 0)
+                        {
+                            await _sqlSugar.Insertable(officialDutyLinkTranslators).ExecuteCommandAsync();
+                        }
                     }
-
                     #endregion
-                    
+
                     _sqlSugar.CommitTran();
                     result = new Result() { Code = 0, Msg = "修改成功！", Data = new { Id = dto.Id } };
                 }