update

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2162,6 +2162,16 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             var jw = JsonView(false);
             try
             {
+                if (dto.ParentId != 0)
+                {
+                    var parent = await _sqlSugar.Queryable<Per_AssessmentSetting>().FirstAsync(x=>x.IsDel == 0 && x.Id == dto.ParentId);
+                    if (parent == null)
+                    {
+                        jw.Msg = "父级节点不存在";
+                        return Ok(jw);
+                    }
+                }
+
                 var entity = new Per_AssessmentSetting
                 {
                     Name = dto.Name,

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1609,7 +1609,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                             else return id;
                         }).ToArray();
 
-                        var _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(x => groupIds.Contains(x.Id)).ToList();
+                        var _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(x => groupIds.Contains(x.Id) && x.IsDel == 0).ToList();
                         foreach (var group in _DelegationInfos)
                         {
                             groupNameStr += $"{group.TeamName},";
@@ -1619,6 +1619,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                             groupNameStr = groupNameStr.Substring(0, groupNameStr.Length - 1);
                         }
                     }
+
+                    item.DelegationStr = groupNameStr;
                 }
 
                 return Ok(JsonView(true, $"查询成功!", _ivitiesViews, totalCount));