From 0f9ab916fa53d31fe8988beadc150081a461cecf Mon Sep 17 00:00:00 2001
From: pangwenpeng <17302161021@163.com>
Date: Wed, 29 May 2024 09:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 langguanApi/Service/RoleService.cs | 14 ++++++++------
 langguanApi/Service/UserService.cs | 21 ---------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/langguanApi/Service/RoleService.cs b/langguanApi/Service/RoleService.cs
index b305d67..fbb7924 100644
--- a/langguanApi/Service/RoleService.cs
+++ b/langguanApi/Service/RoleService.cs
@@ -4,7 +4,6 @@ using langguanApi.Model.Dto.SystemConfigurationDto;
 using langguanApi.Model;
 using langguanApi.Model.Entity;
 using langguanApi.Model.SystemConfigurationEntity;
-using StackExchange.Redis;
 using Mapster;
 using NPOI.SS.Formula.Functions;
 using System.Linq.Expressions;
@@ -14,6 +13,9 @@ using System.Collections.Generic;
 
 namespace langguanApi.Service
 {
+    /// <summary>
+    /// 校色服务
+    /// </summary>
     [ServiceInjection(InjectionType.Transient)]
     public class RoleService : BaseService<Role>
     {
@@ -105,8 +107,8 @@ namespace langguanApi.Service
         /// <returns></returns>
         public async Task<bool> Exist(RoleDto input)
         {
-            var entity = input.Adapt<UserRole>();
-            Expression<Func<UserRole, bool>> exp = filter => filter.RoleName == entity.RoleName;
+            var entity = input.Adapt<Role>();
+            Expression<Func<Role, bool>> exp = filter => filter.RoleName == entity.RoleName;
             return await base.Exist(exp);
         }
         /// <summary>
@@ -120,7 +122,7 @@ namespace langguanApi.Service
             {
                 return new ApiResult { code = 1, msg = $"{input.RoleName}的角色已存在" };
             }
-            var entity = input.Adapt<UserRole>();
+            var entity = input.Adapt<Role>();
             if (entity != null)
             {
                 await base.CreateAsync(entity);
@@ -133,9 +135,9 @@ namespace langguanApi.Service
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public async Task<List<UserRole>> GetRoleListByIds(IEnumerable<string> ids)
+        public async Task<List<Role>> GetRoleListByIds(IEnumerable<string> ids)
         {
-            Expression<Func<UserRole, bool>> exp = filter => ids.Contains(filter.Id) && filter.IsDelete == false;
+            Expression<Func<Role, bool>> exp = filter => ids.Contains(filter.Id) && filter.IsDelete == false;
             var list = (await base.GetListWithExp(exp)).ToList();
             return list;
         }
diff --git a/langguanApi/Service/UserService.cs b/langguanApi/Service/UserService.cs
index 2f72644..c13a2c5 100644
--- a/langguanApi/Service/UserService.cs
+++ b/langguanApi/Service/UserService.cs
@@ -186,18 +186,6 @@ namespace langguanApi.Service
                 {
                     exp = filter => filter.Username.Contains(input.Username);
                 }
-                if (!string.IsNullOrEmpty(input.Tel))
-                {
-                    exp = filter => filter.Tel.Contains(input.Tel);
-                }
-                if (!string.IsNullOrEmpty(input.HiredateStart))
-                {
-                    exp = filter => filter.Hiredate.Value >= DateTime.Parse(input.HiredateStart);
-                }
-                if (!string.IsNullOrEmpty(input.HiredateEnd))
-                {
-                    exp = filter => filter.Hiredate.Value <= DateTime.Parse(input.HiredateEnd);
-                }
                 #endregion
 
                 #region 获取数据
@@ -211,17 +199,8 @@ namespace langguanApi.Service
                     list.Add(new UserListDto
                     {
                         Username = item.Username,
-                        Education = item.Education,
-                        Tel = item.Tel,
                         Email = item.Email,
                         roleName = roleList.FirstOrDefault(s => s.Id == item.roleId)?.RoleName,
-                        Sex = item.Sex == 0 ? "男" : "女",
-                        Address = item.Address,
-                        IsAdmin = item.IsAdmin == 0 ? "否" : "是",
-                        Native = item.Native,
-                        University = item.University,
-                        Hiredate = item.Hiredate.HasValue == true ? item.Hiredate.Value.ToString("yyyy-MM-dd") : "",
-                        Brithday = item.Brithday.HasValue == true ? item.Brithday.Value.ToString("yyyy-MM-dd") : "",
                     });
                 }
                 #endregion