From 1a499350269c812501173f928534e056b4b801d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sat, 22 Oct 2022 22:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=BC=80=E6=BA=901=E7=BE=A4?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E8=A7=92=E8=89=B2=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?bug=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BA=86=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B0=BA=E5=AF=B8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/index/components/carousel.vue     | 6 +++---
 .../sys/modular/role/service/impl/SysRoleServiceImpl.java   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/snowy-admin-web/src/views/index/components/carousel.vue b/snowy-admin-web/src/views/index/components/carousel.vue
index fff59f34..74d38d71 100644
--- a/snowy-admin-web/src/views/index/components/carousel.vue
+++ b/snowy-admin-web/src/views/index/components/carousel.vue
@@ -32,17 +32,17 @@
 
 <style scoped>
 	.carousel-images {
-		height: 150px;
+		height: 160px;
 		width: 100%;
 		cursor: pointer;
 	}
 	.snowy-right-card-one {
-		height: 150px;
+		height: 160px;
 	}
 
 	.ant-carousel :deep(.slick-slide) {
 		text-align: center;
-		height: 150px;
+		height: 160px;
 		line-height: 150px;
 		background: #364d79;
 		overflow: hidden;
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
index f0b0848f..99985e90 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
@@ -141,8 +141,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         if(superRole) {
             throw new CommonException("不可编辑超管角色");
         }
-        if(SysRoleCategoryEnum.ORG.getValue().equals(sysRoleEditParam.getCategory()) && ObjectUtil.isEmpty(sysRoleEditParam.getOrgId())) {
-            throw new CommonException("orgId不能为空");
+        if(SysRoleCategoryEnum.ORG.getValue().equals(sysRoleEditParam.getCategory())) {
+            if (ObjectUtil.isEmpty(sysRoleEditParam.getOrgId())) {
+                throw new CommonException("orgId不能为空");
+            }
         } else {
             sysRoleEditParam.setOrgId(null);
         }