Merge branches 'v5.0.0dev' and 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

This commit is contained in:
From-wh 2023-04-28 14:25:57 +08:00
commit 4c0e4e2e8f

View File

@ -102,6 +102,6 @@ class SystemAdminDao extends BaseDao
*/
public function checkRoleUse(int $id): bool
{
return (bool)$this->getModel()->whereFindInSet('roles', $id)->count();
return (bool)$this->getModel()->where('is_del', 0)->whereFindInSet('roles', $id)->count();
}
}