no message

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

@@ -46,7 +46,8 @@ public class AdminRoleLogic {
                 .eq(StringUtils.isNotBlank(companyWechatName), AdminRole::getCompanyName, companyWechatName)
                 .eq(StringUtils.isNotBlank(adminCompanyId), AdminRole::getCompanyId, adminCompanyId)
                 .eq(Objects.nonNull(type), AdminRole::getType, type)
-                .and(v -> {
+                .ge(userType > 0, AdminRole::getType, userType)
+                .and(CollectionUtils.isNotEmpty(companyIds), v -> {
                     if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
                                 .or()
@@ -55,7 +56,6 @@ public class AdminRoleLogic {
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds);
                     }
                 })
-                .ge(userType > 0, AdminRole::getType, userType)
                 .orderByAsc(AdminRole::getType)
                 .page(new Page<>(pageNo, pageSize));
     }