对比提交去掉没用代码
This commit is contained in:
		
							parent
							
								
									ecacfc7d35
								
							
						
					
					
						commit
						7b283ab0ca
					
				| 
						 | 
					@ -1,23 +0,0 @@
 | 
				
			||||||
using langguanApi.Model;
 | 
					 | 
				
			||||||
using langguanApi.Model.Dto.SystemConfigurationDto;
 | 
					 | 
				
			||||||
using langguanApi.Service;
 | 
					 | 
				
			||||||
using Microsoft.AspNetCore.Mvc;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace langguanApi.Controllers
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    /// <summary>
 | 
					 | 
				
			||||||
    /// 菜单控制器
 | 
					 | 
				
			||||||
    /// </summary>
 | 
					 | 
				
			||||||
    [Route("api/[controller]")]
 | 
					 | 
				
			||||||
    [ApiController]
 | 
					 | 
				
			||||||
    public class MeauController : ControllerBase
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        private MeauService _meuaService;
 | 
					 | 
				
			||||||
        public MeauController(MeauService meauService)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            _meuaService = meauService;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
      
 | 
					 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,8 @@
 | 
				
			||||||
using langguanApi.Model;
 | 
					using langguanApi.Model;
 | 
				
			||||||
using langguanApi.Model.Entity;
 | 
					using langguanApi.Model.Entity;
 | 
				
			||||||
using langguanApi.Model.Dto.SystemConfigurationDto;
 | 
					 | 
				
			||||||
using langguanApi.Service;
 | 
					using langguanApi.Service;
 | 
				
			||||||
using Microsoft.AspNetCore.Http;
 | 
					using Microsoft.AspNetCore.Http;
 | 
				
			||||||
using Microsoft.AspNetCore.Mvc;
 | 
					using Microsoft.AspNetCore.Mvc;
 | 
				
			||||||
using System.Threading.Tasks;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace langguanApi.Controllers
 | 
					namespace langguanApi.Controllers
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,30 +0,0 @@
 | 
				
			||||||
namespace langguanApi.Model.Dto.SystemConfigurationDto
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    public class MeauDto
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 父菜单ID 默认首页为1级,有组织为2级,无组织为2级,下面的子菜单为3级
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string ParentId { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 菜单编码
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string MenuCode { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 菜单名称
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string MenuName { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 可空,菜单跳转路径
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string Url { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 排序
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public int Sort { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 是否激活
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public bool IsActive { get; set; }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,25 +0,0 @@
 | 
				
			||||||
namespace langguanApi.Model.Dto.SystemConfigurationDto
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    /// <summary>
 | 
					 | 
				
			||||||
    /// 角色DTO
 | 
					 | 
				
			||||||
    /// </summary>
 | 
					 | 
				
			||||||
    public class RoleDto
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 角色名称
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string RoleName { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 多个菜单用,隔开
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string Meaus { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 是否管理员
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public bool IsAdmin { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					 | 
				
			||||||
        /// 角色描述
 | 
					 | 
				
			||||||
        /// </summary>
 | 
					 | 
				
			||||||
        public string Description { get; set; }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -29,8 +29,6 @@ namespace langguanApi.Model.Entity
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        public string Phone { get; set; }
 | 
					        public string Phone { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
       //是否管理员    0表示不是管理员  1表示管理员
 | 
					 | 
				
			||||||
       public byte IsAdmin { get; set; }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    /// <summary>
 | 
					    /// <summary>
 | 
				
			||||||
    /// 添加用户DTO
 | 
					    /// 添加用户DTO
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,23 +0,0 @@
 | 
				
			||||||
using langguanApi.Extensions.AutoDI;
 | 
					 | 
				
			||||||
using langguanApi.Model;
 | 
					 | 
				
			||||||
using langguanApi.Model.Dto.SystemConfigurationDto;
 | 
					 | 
				
			||||||
using langguanApi.Model.Entity;
 | 
					 | 
				
			||||||
using Mapster;
 | 
					 | 
				
			||||||
using System.Linq.Expressions;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace langguanApi.Service
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    /// <summary>
 | 
					 | 
				
			||||||
    ///  菜单服务
 | 
					 | 
				
			||||||
    /// </summary>
 | 
					 | 
				
			||||||
    [ServiceInjection(InjectionType.Transient)]
 | 
					 | 
				
			||||||
    public class MeauService : BaseService<Menu>
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        public MeauService(IConfiguration config) : base(config, nameof(Menu))
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -203,7 +203,6 @@ namespace langguanApi.Service
 | 
				
			||||||
                        Email = item.Email,
 | 
					                        Email = item.Email,
 | 
				
			||||||
                        RoleId = item.RoleId,
 | 
					                        RoleId = item.RoleId,
 | 
				
			||||||
                        RoleName = roleList.FirstOrDefault(s => s.Id == item.RoleId)?.RoleName,
 | 
					                        RoleName = roleList.FirstOrDefault(s => s.Id == item.RoleId)?.RoleName,
 | 
				
			||||||
                        IsAdmin = item.IsAdmin == 0 ? "男" : "女",
 | 
					 | 
				
			||||||
                        Tel = item.Phone,
 | 
					                        Tel = item.Phone,
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
| 
						 | 
					@ -261,7 +260,6 @@ namespace langguanApi.Service
 | 
				
			||||||
                    Email = user.Email,
 | 
					                    Email = user.Email,
 | 
				
			||||||
                    RoleId = user.RoleId,
 | 
					                    RoleId = user.RoleId,
 | 
				
			||||||
                    RoleName = role.RoleName,
 | 
					                    RoleName = role.RoleName,
 | 
				
			||||||
                    IsAdmin = user.IsAdmin == 0 ? "男" : "女",
 | 
					 | 
				
			||||||
                    Tel = user.Phone
 | 
					                    Tel = user.Phone
 | 
				
			||||||
                };
 | 
					                };
 | 
				
			||||||
                #endregion
 | 
					                #endregion
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue