github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 06:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
evoxwht 2023-04-28 14:26:31 +08:00
commit 9893ca9ff1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/dao/system/admin/SystemAdminDao.php
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();
}
}

7
template/admin/src/theme/iview.scss
View File

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