diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index f19897f..177430a 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -51,7 +51,7 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:dict:query")] public IActionResult GetInfo(long dictId = 0) { - return SUCCESS(SysDictService.SelectDictTypeById(dictId)); + return SUCCESS(SysDictService.GetFirst(f => f.DictId == dictId)); } /// diff --git a/ZR.Repository/System/SysDictDataRepository.cs b/ZR.Repository/System/SysDictDataRepository.cs index 43b24b6..6cdf0c6 100644 --- a/ZR.Repository/System/SysDictDataRepository.cs +++ b/ZR.Repository/System/SysDictDataRepository.cs @@ -37,16 +37,6 @@ namespace ZR.Repository.System .ToList(); } - /// - /// 根据DictCode查询 - /// - /// - /// - public SysDictData SelectDictDataById(long dictCode) - { - return Db.Queryable().Where(f => f.DictCode == dictCode).First(); - } - /// /// 新增保存字典数据信息 /// @@ -89,16 +79,6 @@ namespace ZR.Repository.System return Db.Deleteable().In(dictCodes).ExecuteCommand(); } - /// - /// 查询字典数据 - /// - /// - /// - public int CountDictDataByType(string dictType) - { - return Db.Queryable().Count(f => f.DictType == dictType); - } - /// /// 同步修改字典类型 /// diff --git a/ZR.Repository/System/SysDictRepository.cs b/ZR.Repository/System/SysDictRepository.cs index ba12198..e01de1b 100644 --- a/ZR.Repository/System/SysDictRepository.cs +++ b/ZR.Repository/System/SysDictRepository.cs @@ -30,36 +30,6 @@ namespace ZR.Repository.System return list; } - /// - /// 根据Id查询 - /// - /// - /// - public SysDictType SelectDictTypeById(long id) - { - return Db.Queryable().First(it => it.DictId == id); - } - - /// - /// 检查字典类型唯一值 - /// - /// - /// - public SysDictType CheckDictTypeUnique(string dictType) - { - return Db.Queryable().First(it => it.DictType == dictType); - } - - /// - /// 删除一个 - /// - /// - /// - public int DeleteDictTypeById(long id) - { - return Db.Deleteable().In(id).ExecuteCommand(); - } - /// /// 批量删除 /// @@ -70,18 +40,6 @@ namespace ZR.Repository.System return Db.Deleteable().In(id).ExecuteCommand(); } - /// - /// 插入 - /// - /// - /// - public long InsertDictType(SysDictType sysDictType) - { - var result = Db.Insertable(sysDictType).IgnoreColumns(it => new { sysDictType.Update_by }) - .ExecuteReturnIdentity(); - return result; - } - /// /// 修改 /// diff --git a/ZR.Service/IService/ISysDictService.cs b/ZR.Service/IService/ISysDictService.cs index b279ed8..0bdb274 100644 --- a/ZR.Service/IService/ISysDictService.cs +++ b/ZR.Service/IService/ISysDictService.cs @@ -12,13 +12,6 @@ namespace ZR.Service.IService { public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); - /// - /// 根据Id查询 - /// - /// - /// - public SysDictType SelectDictTypeById(long id); - /// /// 校验字典类型称是否唯一 /// @@ -26,13 +19,6 @@ namespace ZR.Service.IService /// public string CheckDictTypeUnique(SysDictType dictType); - /// - /// 删除一个 - /// - /// - /// - public int DeleteDictTypeById(long id); - /// /// 批量删除字典数据信息 /// diff --git a/ZR.Service/System/SysDeptService.cs b/ZR.Service/System/SysDeptService.cs index f83b21c..1f325ec 100644 --- a/ZR.Service/System/SysDeptService.cs +++ b/ZR.Service/System/SysDeptService.cs @@ -132,7 +132,8 @@ namespace ZR.Service.System if (child.DeptId.Equals(deptId)) { - DeptRepository.UdateDeptChildren(child); + Saveable(child, it => new { it.Ancestors }); + //DeptRepository.UdateDeptChildren(child); } } } diff --git a/ZR.Service/System/SysDictDataService.cs b/ZR.Service/System/SysDictDataService.cs index 9e65056..4911ecc 100644 --- a/ZR.Service/System/SysDictDataService.cs +++ b/ZR.Service/System/SysDictDataService.cs @@ -53,9 +53,9 @@ namespace ZR.Service.System public SysDictData SelectDictDataById(long dictCode) { string CK = $"SelectDictDataByCode_{dictCode}"; - if (!(CacheHelper.GetCache(CK) is SysDictData list)) + if (CacheHelper.GetCache(CK) is not SysDictData list) { - list = SysDictDataRepository.SelectDictDataById(dictCode); + list = GetFirst(f => f.DictCode == dictCode); CacheHelper.SetCache(CK, list, 5); } return list; diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index 2b39f20..84afc67 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -14,7 +14,7 @@ namespace ZR.Service.System /// [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)] public class SysDictService : BaseService, ISysDictService - { + { private SysDictRepository sysDictRepository; private SysDictDataRepository DictDataRepository; @@ -34,16 +34,6 @@ namespace ZR.Service.System return sysDictRepository.SelectDictTypeList(dictType, pager); } - /// - /// 根据Id查询 - /// - /// - /// - public SysDictType SelectDictTypeById(long id) - { - return sysDictRepository.SelectDictTypeById(id); - } - /// /// 校验字典类型称是否唯一 /// @@ -51,7 +41,7 @@ namespace ZR.Service.System /// public string CheckDictTypeUnique(SysDictType dictType) { - SysDictType sysDictType = sysDictRepository.CheckDictTypeUnique(dictType.DictType); + SysDictType sysDictType = GetFirst(f => f.DictType == dictType.DictType); if (sysDictType != null && sysDictType.DictId != dictType.DictId) { return UserConstants.NOT_UNIQUE; @@ -59,16 +49,6 @@ namespace ZR.Service.System return UserConstants.UNIQUE; } - /// - /// 删除一个 - /// - /// - /// - public int DeleteDictTypeById(long id) - { - return sysDictRepository.DeleteDictTypeById(id); - } - /// /// 批量删除字典数据信息 /// @@ -78,8 +58,8 @@ namespace ZR.Service.System { foreach (var dictId in dictIds) { - SysDictType dictType = SelectDictTypeById(dictId); - if (DictDataRepository.CountDictDataByType(dictType.DictType) > 0) + SysDictType dictType = GetFirst(x => x.DictId == dictId); + if (GetCount(f => f.DictType == dictType.DictType) > 0) { throw new CustomException($"{dictType.DictName}已分配,不能删除"); } @@ -99,7 +79,7 @@ namespace ZR.Service.System /// public long InsertDictType(SysDictType sysDictType) { - return sysDictRepository.InsertDictType(sysDictType); + return Saveable(sysDictType, iColumns: it => new { sysDictType.Update_by }).DictId; } /// @@ -109,7 +89,7 @@ namespace ZR.Service.System /// public int UpdateDictType(SysDictType sysDictType) { - SysDictType oldDict = sysDictRepository.SelectDictTypeById(sysDictType.DictId); + SysDictType oldDict = GetFirst(x => x.DictId == sysDictType.DictId); if (sysDictType.DictType != oldDict.DictType) { //同步修改 dict_data表里面的DictType值 diff --git a/ZR.Vue/src/components/SizeSelect/index.vue b/ZR.Vue/src/components/SizeSelect/index.vue index e88065b..2569863 100644 --- a/ZR.Vue/src/components/SizeSelect/index.vue +++ b/ZR.Vue/src/components/SizeSelect/index.vue @@ -1,12 +1,11 @@