From 4e700eaefaf946f08b3bfe3611083e638d1fac64 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Fri, 28 Apr 2023 14:22:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/system/admin/SystemAdminDao.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From b830e945dcb8adce0f581f6dc69439c7385e40ca Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 28 Apr 2023 14:25:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E7=AB=96=E5=90=91tab=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/theme/iview.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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