diff --git a/crmeb/app/dao/system/admin/SystemAdminDao.php b/crmeb/app/dao/system/admin/SystemAdminDao.php index 583855d85..77173b70e 100644 --- a/crmeb/app/dao/system/admin/SystemAdminDao.php +++ b/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(); } } diff --git a/template/admin/src/theme/iview.scss b/template/admin/src/theme/iview.scss index 79c2cfca4..2777cf386 100644 --- a/template/admin/src/theme/iview.scss +++ b/template/admin/src/theme/iview.scss @@ -17,7 +17,12 @@ .ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab-active { color: var(--prev-color-primary); } - +.ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu) { + color: var(--prev-color-primary); +} +.ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu):after { + background-color: var(--prev-color-primary); +} // 单选卡 .ivu-radio-group-button .ivu-radio-wrapper-checked:first-child { border-color: var(--prev-color-primary);