优化一些代码

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);
                 }
             }
         }

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;

ZR.Service/System/SysDictService.cs

@@ -14,7 +14,7 @@ namespace ZR.Service.System
     /// </summary>
     [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)]
     public class SysDictService : BaseService<SysDictType>, ISysDictService
-    { 
+    {
         private SysDictRepository sysDictRepository;
         private SysDictDataRepository DictDataRepository;
 
@@ -34,16 +34,6 @@ namespace ZR.Service.System
             return sysDictRepository.SelectDictTypeList(dictType, pager);
         }
 
-        /// <summary>
-        /// 根据Id查询
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public SysDictType SelectDictTypeById(long id)
-        {
-            return sysDictRepository.SelectDictTypeById(id);
-        }
-
         /// <summary>
         /// 校验字典类型称是否唯一
         /// </summary>
@@ -51,7 +41,7 @@ namespace ZR.Service.System
         /// <returns></returns>
         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;
         }
 
-        /// <summary>
-        /// 删除一个
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public int DeleteDictTypeById(long id)
-        {
-            return sysDictRepository.DeleteDictTypeById(id);
-        }
-
         /// <summary>
         /// 批量删除字典数据信息
         /// </summary>
@@ -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
         /// <returns></returns>
         public long InsertDictType(SysDictType sysDictType)
         {
-            return sysDictRepository.InsertDictType(sysDictType);
+            return Saveable(sysDictType, iColumns: it => new { sysDictType.Update_by }).DictId;
         }
 
         /// <summary>
@@ -109,7 +89,7 @@ namespace ZR.Service.System
         /// <returns></returns>
         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值