Merge branch 'master' into net6.0

2022-03-17 21:38:30 +08:00
parent 7d134bc832 74bf025a65
commit cb9bc0ea8f
17 changed files with 422 additions and 368 deletions
--- a/ZR.Service/System/SysDictService.cs
+++ b/ZR.Service/System/SysDictService.cs
@@ -63,7 +63,7 @@ namespace ZR.Service.System
            foreach (var dictId in dictIds)
            {
                SysDictType dictType = DictRepository.GetFirst(x => x.DictId == dictId);
-                if (DictRepository.Count(f => f.DictType == dictType.DictType) > 0)
+                if (DictDataRepository.Count(f => f.DictType == dictType.DictType) > 0)
                {
                    throw new CustomException($"{dictType.DictName}已分配,不能删除");
                }