wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/izhaorui/ZrAdmin.NET

Browse Source
This commit is contained in:
不做码农 2021-11-18 14:15:29 +08:00
commit ba0f9698d1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
View File

@ -138,7 +138,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除")); return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除"));
} }
if (DeptService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == "0") > 0) if (UserService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == "0") > 0)
{ {
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除")); return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除"));
} }

2
ZR.Service/System/IService/ISysUserService.cs
View File

@ -8,7 +8,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService namespace ZR.Service.System.IService
{ {
public interface ISysUserService public interface ISysUserService : IBaseService<SysUser>
{ {
public List<SysUser> SelectUserList(SysUser user, PagerInfo pager); public List<SysUser> SelectUserList(SysUser user, PagerInfo pager);

2
ZR.Service/System/SysUserService.cs
View File

@ -11,7 +11,7 @@ using ZR.Service.System.IService;
namespace ZR.Service namespace ZR.Service
{ {
[AppService(ServiceType = typeof(ISysUserService), ServiceLifetime = LifeTime.Transient)] [AppService(ServiceType = typeof(ISysUserService), ServiceLifetime = LifeTime.Transient)]
public class SysUserService : ISysUserService public class SysUserService : BaseService<SysUser>, ISysUserService
{ {
private readonly SysUserRepository UserRepository; private readonly SysUserRepository UserRepository;
private readonly ISysRoleService RoleService; private readonly ISysRoleService RoleService;