Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Core/Enum/CultureLevelEnum.cs

@@ -15,51 +15,75 @@ namespace Admin.NET.Core;
 [Description("文化程度枚举")]
 public enum CultureLevelEnum
 {
+    /// <summary>
+    /// 其他
+    /// </summary>
+    [Description("其他")]
+    Level0 = 0,
+
     /// <summary>
     /// 小学
     /// </summary>
     [Description("小学")]
-    Level1 = 0,
+    Level1 = 1,
 
     /// <summary>
     /// 初中
     /// </summary>
     [Description("初中")]
-    Level2 = 1,
+    Level2 = 2,
+
+    /// <summary>
+    /// 普通高中
+    /// </summary>
+    [Description("普通高中")]
+    Level3 = 3,
+
+    /// <summary>
+    /// 技工学校
+    /// </summary>
+    [Description("技工学校")]
+    Level4 = 4,
+
+    /// <summary>
+    /// 职业教育
+    /// </summary>
+    [Description("职业教育")]
+    Level5 = 5,
 
     /// <summary>
-    /// 高中
+    /// 职业高中
     /// </summary>
-    [Description("高中")]
-    Level3 = 2,
+    [Description("职业高中")]
+    Level6 = 6,
 
     /// <summary>
-    /// 中专
+    /// 中等专科
     /// </summary>
-    [Description("中专")]
-    Level4 = 3,
+    [Description("中等专科")]
+    Level7 = 7,
 
     /// <summary>
-    /// 大专
+    /// 大学专科
     /// </summary>
-    [Description("大专")]
-    Level5 = 4,
+    [Description("大学专科")]
+    Level8 = 8,
 
     /// <summary>
-    /// 本科
+    /// 大学本科
     /// </summary>
-    [Description("本科")]
-    Level6 = 5,
+    [Description("大学本科")]
+    Level9 = 9,
 
     /// <summary>
     /// 硕士研究生
     /// </summary>
     [Description("硕士研究生")]
-    Level7 = 6,
+    Level10 = 10,
 
     /// <summary>
     /// 博士研究生
     /// </summary>
     [Description("博士研究生")]
-    Level8 = 7,
+    Level11 = 11,
 }

Admin.NET/Admin.NET.Core/Enum/MaritalStatusEnum.cs

@@ -0,0 +1,37 @@
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 婚姻状况枚举
+/// </summary>
+[Description("婚姻状况枚举")]
+public enum MaritalStatusEnum
+{
+    /// <summary>
+    /// 未知
+    /// </summary>
+    [Description("未知")]
+    None = 0,
+    /// <summary>
+    /// 未婚
+    /// </summary>
+    [Description("未婚")]
+    UnMarried = 1,
+
+    /// <summary>
+    /// 已婚
+    /// </summary>
+    [Description("已婚")]
+    Married = 2,
+
+    /// <summary>
+    /// 离异
+    /// </summary>
+    [Description("离异")]
+    Divorce = 3,
+
+    /// <summary>
+    /// 丧偶
+    /// </summary>
+    [Description("丧偶")]
+    Widowed = 4,
+}

Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -110,12 +110,13 @@ public class SysOrgService : IDynamicApiController, ITransient
             // 新增机构的父机构不在自己的数据范围内
             if (orgIdList.Count < 1 || !orgIdList.Contains(input.Pid))
                 throw Oops.Oh(ErrorCodeEnum.D2003);
-
-            // 删除与此父机构有关的用户机构缓存
-            var pOrg = await _sysOrgRep.GetFirstAsync(u => u.Id == input.Pid);
-            DeleteUserOrgCache(pOrg.Id, pOrg.Pid);
         }
-
+        
+        // 删除与此父机构有关的用户机构缓存
+        var pOrg = await _sysOrgRep.GetFirstAsync(u => u.Id == input.Pid);
+        if (pOrg != null)
+            DeleteUserOrgCache(pOrg.Id, pOrg.Pid);
+        
         var newOrg = await _sysOrgRep.AsInsertable(input.Adapt<SysOrg>()).ExecuteReturnEntityAsync();
         return newOrg.Id;
     }