Jelajahi Sumber

新增部门编辑排序

zhontai 2 tahun lalu
induk
melakukan
7cccd9104f

+ 1 - 1
build/pkg.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
 	<TargetFramework>net7.0</TargetFramework>
 	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

+ 10 - 3
src/platform/ZhonTai.Admin/Services/Org/OrgService.cs

@@ -71,11 +71,18 @@ public class OrgService : BaseService, IOrgService, IDynamicApi
             throw ResultOutput.Exception($"此部门编码已存在");
         }
 
-        var dictionary = Mapper.Map<OrgEntity>(input);
-        await _orgRepository.InsertAsync(dictionary);
+        var entity = Mapper.Map<OrgEntity>(input);
+
+        if (entity.Sort == 0)
+        {
+            var sort = await _orgRepository.Select.Where(a => a.ParentId == input.ParentId).MaxAsync(a => a.Sort);
+            entity.Sort = sort + 1;
+        }
+
+        await _orgRepository.InsertAsync(entity);
         await Cache.DelByPatternAsync(CacheKeys.DataPermission + "*");
 
-        return dictionary.Id;
+        return entity.Id;
     }
 
     /// <summary>

+ 9 - 4
src/platform/ZhonTai.Admin/Services/Org/Output/OrgListOutput.cs

@@ -30,14 +30,19 @@ public class OrgListOutput
     public string Value { get; set; }
 
     /// <summary>
-    /// 描述
+    /// 启用
     /// </summary>
-    public string Description { get; set; }
+	public bool Enabled { get; set; }
 
     /// <summary>
-    /// 启用
+    /// 排序
     /// </summary>
-	public bool Enabled { get; set; }
+	public int Sort { get; set; }
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string Description { get; set; }
 
     /// <summary>
     /// 创建时间

+ 9 - 4
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -4457,14 +4457,19 @@
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Description">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Enabled">
             <summary>
-            描述
+            启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Enabled">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Sort">
             <summary>
-            启用
+            排序
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Description">
+            <summary>
+            描述
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.CreatedTime">