整理仓储2

IRaCIS.Core.Application/Service/Management/MenuService.cs

@@ -7,7 +7,7 @@ namespace IRaCIS.Application.Services
 {
     [ApiExplorerSettings(GroupName = "Management")]
     public class MenuService(
-        IRepository<Menu> menuRepository,
+        IRepository<Menu> _menuRepository,
         IRepository<UserTypeMenu> _userTypeMenuRepository) : BaseService, IMenuService
     {
        
@@ -26,7 +26,7 @@ namespace IRaCIS.Application.Services
                 VerifyMsg = _localizer["Menu_ParentDupChild"]
             };
 
-            var menu = await _repository.InsertOrUpdateAsync<Menu, MenuCommand>(menuAddOrUpdateModel, true, exp);
+            var menu = await _menuRepository.InsertOrUpdateAsync(menuAddOrUpdateModel, true, exp);
 
             return ResponseOutput.Ok(menu.Id.ToString());
 
@@ -85,13 +85,13 @@ namespace IRaCIS.Application.Services
         [HttpDelete("{menuId:guid}")]
         public async Task<IResponseOutput> DeleteMenu(Guid menuId)
         {
-            if (await menuRepository.AnyAsync(t => t.ParentId == menuId))
+            if (await _menuRepository.AnyAsync(t => t.ParentId == menuId))
             {
                 //---该节点存在子节点，请在删除子节点后，再删除该节点。
                 return ResponseOutput.NotOk(_localizer["Menu_ChildExist"]);
             }
 
-            var success =await menuRepository.BatchDeleteNoTrackingAsync(u => u.Id == menuId);
+            var success =await _menuRepository.BatchDeleteNoTrackingAsync(u => u.Id == menuId);
 
             return ResponseOutput.Result(success);
         }
@@ -104,7 +104,7 @@ namespace IRaCIS.Application.Services
         [HttpGet]
         public async Task<List<MenuTreeNode>> GetMenuTree()
         {
-            var allMenuList = (await menuRepository.ProjectTo<MenuTreeNode>(_mapper.ConfigurationProvider).ToListAsync()).IfNullThrowException();
+            var allMenuList = (await _menuRepository.ProjectTo<MenuTreeNode>(_mapper.ConfigurationProvider).ToListAsync()).IfNullThrowException();
 
             var list = allMenuList.ToTree((root, child) => child.ParentId == Guid.Empty,
              (root, child) => child.ParentId == root.MenuId,
@@ -125,7 +125,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<MenuDTO>> GetMenuList(MenuQueyDTO menuQueyDTO)
         {
-            return await menuRepository
+            return await _menuRepository
                   .WhereIf(menuQueyDTO.ParentId != null, t => t.ParentId == menuQueyDTO.ParentId)
                   .WhereIf(menuQueyDTO.IsEnable != null, t => t.IsEnable == menuQueyDTO.IsEnable)
                   .WhereIf(menuQueyDTO.IsCache != null, t => t.IsCache == menuQueyDTO.IsCache)
@@ -146,7 +146,7 @@ namespace IRaCIS.Application.Services
         [HttpGet("{userTypeId:guid}")]
         public async Task<List<MenuTreeNodeSelect>> GetUserTypeMenuTree(Guid userTypeId)
         {
-            var menuFunctionlist = (await menuRepository
+            var menuFunctionlist = (await _menuRepository
                    .ProjectTo<MenuTreeNodeSelect>(_mapper.ConfigurationProvider, new { userTypeId = userTypeId }).ToListAsync()).IfNullThrowException();
 
 
@@ -189,7 +189,7 @@ namespace IRaCIS.Application.Services
                    .Where(t => t.UserTypeId == _userInfo.UserTypeId && t.Menu.MenuType == "F")
                    .Select(t => t.Menu.PermissionStr).ToListAsync();
 
-            //var str = await _repository.Where<UserType>(t => t.Id == _userInfo.UserTypeId).Select(t => t.PermissionStr).FirstOrDefaultAsync();
+            //var str = await _userTypeRepository.Where(t => t.Id == _userInfo.UserTypeId).Select(t => t.PermissionStr).FirstOrDefaultAsync();
 
 
             list.Add(_userInfo.PermissionStr);

IRaCIS.Core.Application/Service/Management/UserTypeService.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Contracts
     /// UserTypeRoleService 
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Management")]
-    public class UserTypeRoleService(IRepository<UserType> _userTypeRepository) : BaseService, IUserTypeService
+    public class UserTypeRoleService(IRepository<UserType> _userTypeRepository, IRepository<User> _userRepository) : BaseService, IUserTypeService
     {
        
         [HttpPost]
@@ -71,7 +71,7 @@ namespace IRaCIS.Core.Application.Contracts
                 await _userTypeRepository.EntityVerifyAsync(entity.Id, verifyExp1);
             }
 
-            var success = await _repository.SaveChangesAsync();
+            var success = await _userTypeRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok( entity.Id.ToString());
 
@@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpDelete("{userTypeId:guid}")]
         public async Task<IResponseOutput> DeleteUserTypeRole(Guid userTypeId)
         {
-            if ( await _repository.AnyAsync<User>(t => t.UserTypeId == userTypeId))
+            if ( await _userRepository.AnyAsync(t => t.UserTypeId == userTypeId))
             {
                 //---该用户类型中已存在用户，不能删除
                 return ResponseOutput.NotOk(_localizer["UserType_InUse"]);