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

crmeb/app/dao/system/admin/SystemAdminDao.php

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