sunpengfei
2025-08-04 b9b4c926a7898d8b7d657e75ec83064390a5f9fb
pref:childrens命名修改
7个文件已修改
88 ■■■■ 已修改文件
FlexJobApi.Core/Entities/Common/DictionaryData.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Entities/Users/Department.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Entities/Users/Menu.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/FlexJobApi.Core.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.User.Application/Menus/Commands/DeleteMenuCommandHandler.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Entities/Common/DictionaryData.cs
@@ -17,7 +17,7 @@
    {
        public DictionaryData()
        {
            Childrens = [];
            Children = [];
        }
        /// <summary>
@@ -43,7 +43,7 @@
        /// <summary>
        /// 下级
        /// </summary>
        public List<DictionaryData> Childrens { get; set; }
        public List<DictionaryData> Children { get; set; }
        /// <summary>
        /// 字典路径
@@ -90,7 +90,7 @@
        public void Configure(EntityTypeBuilder<DictionaryData> entityBuilder, DbContext dbContext, Type dbContextLocator)
        {
            entityBuilder
                .HasMany(x => x.Childrens)
                .HasMany(x => x.Children)
                .WithOne(x => x.Parent)
                .HasForeignKey(x => x.ParentId)
                .OnDelete(DeleteBehavior.ClientSetNull);
FlexJobApi.Core/Entities/Users/Department.cs
@@ -17,7 +17,7 @@
    {
        public Department()
        {
            Childrens = [];
            Children = [];
        }
        /// <summary>
@@ -33,7 +33,7 @@
        /// <summary>
        /// 下级
        /// </summary>
        public List<Department> Childrens { get; set; }
        public List<Department> Children { get; set; }
        /// <summary>
        /// 部门路径
@@ -69,7 +69,7 @@
        public void Configure(EntityTypeBuilder<Department> entityBuilder, DbContext dbContext, Type dbContextLocator)
        {
            entityBuilder
                .HasMany(x => x.Childrens)
                .HasMany(x => x.Children)
                .WithOne(x => x.Parent)
                .HasForeignKey(x => x.ParentId)
                .OnDelete(DeleteBehavior.ClientSetNull);
FlexJobApi.Core/Entities/Users/Menu.cs
@@ -17,7 +17,7 @@
    {
        public Menu()
        {
            Childrens = [];
            Children = [];
        }
        /// <summary>
@@ -43,7 +43,7 @@
        /// <summary>
        /// 下级
        /// </summary>
        public List<Menu> Childrens { get; set; }
        public List<Menu> Children { get; set; }
        /// <summary>
        /// 菜单路径
@@ -116,7 +116,7 @@
        public void Configure(EntityTypeBuilder<Menu> entityBuilder, DbContext dbContext, Type dbContextLocator)
        {
            entityBuilder
                .HasMany(x => x.Childrens)
                .HasMany(x => x.Children)
                .WithOne(x => x.Parent)
                .HasForeignKey(x => x.ParentId)
                .OnDelete(DeleteBehavior.ClientSetNull);
FlexJobApi.Core/FlexJobApi.Core.xml
@@ -104,7 +104,7 @@
            上级
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.DictionaryData.Childrens">
        <member name="P:FlexJobApi.Core.DictionaryData.Children">
            <summary>
            下级
            </summary>
@@ -669,7 +669,7 @@
            上级
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.Department.Childrens">
        <member name="P:FlexJobApi.Core.Department.Children">
            <summary>
            下级
            </summary>
@@ -844,7 +844,7 @@
            上级
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.Menu.Childrens">
        <member name="P:FlexJobApi.Core.Menu.Children">
            <summary>
            下级
            </summary>
FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
@@ -85,7 +85,7 @@
                    b.HasIndex("ParentId");
                    b.ToTable("Department", t =>
                    b.ToTable("Department", null, t =>
                        {
                            t.HasComment("部门");
                        });
@@ -141,7 +141,7 @@
                    b.HasKey("Id");
                    b.ToTable("DictionaryCategory", t =>
                    b.ToTable("DictionaryCategory", null, t =>
                        {
                            t.HasComment("字典类别");
                        });
@@ -227,7 +227,7 @@
                    b.HasIndex("ParentId");
                    b.ToTable("DictionaryData", t =>
                    b.ToTable("DictionaryData", null, t =>
                        {
                            t.HasComment("字典数据");
                        });
@@ -350,7 +350,7 @@
                    b.HasIndex("LicenseImageId");
                    b.ToTable("Enterprise", t =>
                    b.ToTable("Enterprise", null, t =>
                        {
                            t.HasComment("企业");
                        });
@@ -441,7 +441,7 @@
                    b.HasKey("Id");
                    b.ToTable("FileStore", t =>
                    b.ToTable("FileStore", null, t =>
                        {
                            t.HasComment("文件存储");
                        });
@@ -497,7 +497,7 @@
                    b.HasIndex("StoreId");
                    b.ToTable("FileVirtualPath", t =>
                    b.ToTable("FileVirtualPath", null, t =>
                        {
                            t.HasComment("文件虚拟路径");
                        });
@@ -606,7 +606,7 @@
                    b.HasIndex("ParentId");
                    b.ToTable("Menu", t =>
                    b.ToTable("Menu", null, t =>
                        {
                            t.HasComment("菜单");
                        });
@@ -684,7 +684,7 @@
                    b.HasKey("Id");
                    b.ToTable("Resource", t =>
                    b.ToTable("Resource", null, t =>
                        {
                            t.HasComment("资源");
                        });
@@ -742,7 +742,7 @@
                    b.HasKey("Id");
                    b.ToTable("Role", t =>
                    b.ToTable("Role", null, t =>
                        {
                            t.HasComment("角色");
                        });
@@ -794,7 +794,7 @@
                    b.HasIndex("RoleId");
                    b.ToTable("RoleMenu", t =>
                    b.ToTable("RoleMenu", null, t =>
                        {
                            t.HasComment("角色菜单");
                        });
@@ -850,7 +850,7 @@
                    b.HasIndex("RoleId");
                    b.ToTable("RoleResource", t =>
                    b.ToTable("RoleResource", null, t =>
                        {
                            t.HasComment("角色资源");
                        });
@@ -943,7 +943,7 @@
                    b.HasIndex("EnterpriseId");
                    b.ToTable("TaskInfo", t =>
                    b.ToTable("TaskInfo", null, t =>
                        {
                            t.HasComment("任务信息");
                        });
@@ -998,7 +998,7 @@
                    b.HasIndex("BenefitId1");
                    b.ToTable("TaskInfoBenefit", t =>
                    b.ToTable("TaskInfoBenefit", null, t =>
                        {
                            t.HasComment("任务福利");
                        });
@@ -1050,7 +1050,7 @@
                    b.HasIndex("TypeId");
                    b.ToTable("TaskInfoCredentialLimit");
                    b.ToTable("TaskInfoCredentialLimit", (string)null);
                });
            modelBuilder.Entity("FlexJobApi.Core.TaskInfoUser", b =>
@@ -1115,7 +1115,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("TaskInfoUser", t =>
                    b.ToTable("TaskInfoUser", null, t =>
                        {
                            t.HasComment("任务用户信息");
                        });
@@ -1221,7 +1221,7 @@
                    b.HasIndex("IdentityImgId");
                    b.ToTable("UserAuth", t =>
                    b.ToTable("UserAuth", null, t =>
                        {
                            t.HasComment("用户");
                        });
@@ -1342,7 +1342,7 @@
                    b.HasIndex("UserAuthId");
                    b.ToTable("UserInfo", t =>
                    b.ToTable("UserInfo", null, t =>
                        {
                            t.HasComment("用户信息");
                        });
@@ -1418,7 +1418,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoBankCard", t =>
                    b.ToTable("UserInfoBankCard", null, t =>
                        {
                            t.HasComment("用户银行卡信息");
                        });
@@ -1504,7 +1504,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoCredential", t =>
                    b.ToTable("UserInfoCredential", null, t =>
                        {
                            t.HasComment("用户信息资格证书");
                        });
@@ -1556,7 +1556,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoDepartment", t =>
                    b.ToTable("UserInfoDepartment", null, t =>
                        {
                            t.HasComment("用户信息部门");
                        });
@@ -1608,7 +1608,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoExpectJob", t =>
                    b.ToTable("UserInfoExpectJob", null, t =>
                        {
                            t.HasComment("用户信息期望岗位");
                        });
@@ -1660,7 +1660,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoPhoto", t =>
                    b.ToTable("UserInfoPhoto", null, t =>
                        {
                            t.HasComment("用户信息生活照");
                        });
@@ -1712,7 +1712,7 @@
                    b.HasIndex("UserInfoId");
                    b.ToTable("UserInfoRole", t =>
                    b.ToTable("UserInfoRole", null, t =>
                        {
                            t.HasComment("用户信息角色");
                        });
FlexJobApi.User.Application/Menus/Commands/DeleteMenuCommandHandler.cs
@@ -25,11 +25,11 @@
        public async Task<int> Handle(DeleteMenuCommand request, CancellationToken cancellationToken)
        {
            var entities = await rep.AsQueryable()
                .Include(it => it.Childrens)
                .Include(it => it.Children)
                .Where(it => request.Ids.Contains(it.Id))
                .ToListAsync(cancellationToken);
            return entities.Any()
                ? await rep.DeleteNowAsync(entities.Union(entities.SelectMany(it => it.Childrens)), cancellationToken)
                ? await rep.DeleteNowAsync(entities.Union(entities.SelectMany(it => it.Children)), cancellationToken)
                : 0;
        }
    }
FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs
@@ -32,7 +32,7 @@
            if (request.Id.HasValue)
            {
                var entity = await rep.AsQueryable()
                    .Include(it => it.Childrens)
                    .Include(it => it.Children)
                    .FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken);
                if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "菜单");
                if (entity.UserType != request.UserType) throw Oops.Oh(EnumErrorCodeType.s410, "用户类型");
@@ -71,7 +71,7 @@
            // 获取子集Id
            var childrenIds = GetRequestChildrenIds(request);
            // 删除子级
            entity.Childrens = entity.Childrens
            entity.Children = entity.Children
                .Where(it => 
                    it.Type == EnumMenuType.Menu 
                    || it.Type == EnumMenuType.Page 
@@ -89,7 +89,7 @@
                    // 遍历按钮 添加或更新
                    foreach (var button in buttonLocation.Buttons)
                    {
                        var buttonEntity = entity.Childrens.FirstOrDefault(it => it.Id == button.Id);
                        var buttonEntity = entity.Children.FirstOrDefault(it => it.Id == button.Id);
                        if (buttonEntity == null)
                        {
                            if (button.Id.HasValue) throw Oops.Oh(EnumErrorCodeType.s404, $"当前分组{group.Group}-位置{buttonLocation.Location}-按钮{button.Code}");
@@ -99,7 +99,7 @@
                                ClientType = entity.ClientType,
                                Type = EnumMenuType.Button,
                            };
                            entity.Childrens.Add(buttonEntity);
                            entity.Children.Add(buttonEntity);
                        }
                        else if (buttonEntity.Type != EnumMenuType.Button) throw Oops.Oh(EnumErrorCodeType.s400, $"当前分组{group.Group}-字段{button.Code}并非一个按钮");
                        buttonEntity.Path = $"{entity.Path}{entity.Code}/";
@@ -112,7 +112,7 @@
                // 遍历字段 添加或更新
                foreach (var field in group.Fields)
                {
                    var fieldEntity = entity.Childrens.FirstOrDefault(it => it.Id == field.Id);
                    var fieldEntity = entity.Children.FirstOrDefault(it => it.Id == field.Id);
                    if (fieldEntity == null)
                    {
                        if (field.Id.HasValue) throw Oops.Oh(EnumErrorCodeType.s404, $"当前分组{group.Group}-字段{field.Code}");
@@ -122,7 +122,7 @@
                            ClientType = entity.ClientType,
                            Type = EnumMenuType.Field,
                        };
                        entity.Childrens.Add(fieldEntity);
                        entity.Children.Add(fieldEntity);
                    }
                    else if (fieldEntity.Type != EnumMenuType.Field) throw Oops.Oh(EnumErrorCodeType.s400, $"当前分组{group.Group}-位置{fieldEntity.Location}-按钮{fieldEntity.Code}并非一个字段");
                    fieldEntity.Path = $"{entity.Path}{entity.Code}/";
@@ -139,7 +139,7 @@
        /// <param name="entity"></param>
        private void CheckRepeatChildrens(Menu entity)
        {
            var repeats = entity.Childrens
            var repeats = entity.Children
                .GroupBy(it =>
                {
                    return it.Type == EnumMenuType.Button