no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminRoleLogic.java

@@ -73,7 +73,8 @@ public class AdminRoleLogic {
 
         if (adminUser.getType() == 1
                 && Objects.nonNull(adminRole.getLevel())
-                && adminRole.getLevel() != 0) {
+                && adminRole.getLevel() != 0
+                && adminRole.getType() == 1) {
             final Integer count = adminRoleService.lambdaQuery()
                     .eq(AdminRole::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .eq(AdminRole::getType, 1)
@@ -84,6 +85,9 @@ public class AdminRoleLogic {
             }
         }
 
+        if (Objects.nonNull(adminRole.getType()) && adminRole.getType() == 0 && adminRole.getLevel() == 0) {
+            throw new RemoteServiceException("网点需要选级别");
+        }
 
         adminRole.setCompanyWechatId(adminUser.getCompanyWechatId());
         adminRole.setCompanyName(adminUser.getCompanyName());
@@ -98,7 +102,8 @@ public class AdminRoleLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         if (adminUser.getType() == 1
                 && Objects.nonNull(adminRole.getLevel())
-                && adminRole.getLevel() != 0) {
+                && adminRole.getLevel() != 0
+                && adminRole.getType() == 1) {
             final Integer count = adminRoleService.lambdaQuery()
                     .eq(AdminRole::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .eq(AdminRole::getType, 1)
@@ -109,6 +114,9 @@ public class AdminRoleLogic {
                 throw new RemoteServiceException("已存在同级别的角色不能再添加");
             }
         }
+        if (Objects.nonNull(adminRole.getType()) && adminRole.getType() == 0 && adminRole.getLevel() == 0) {
+            throw new RemoteServiceException("网点需要选级别");
+        }
         adminRoleService.updateById(adminRole);
 
         if (adminRole.getName() != null) {