diff --git a/platform-web-ui/src/components/CascaderDept/index.vue b/platform-web-ui/src/components/CascaderDept/index.vue
index 60b8c61..1250eac 100644
--- a/platform-web-ui/src/components/CascaderDept/index.vue
+++ b/platform-web-ui/src/components/CascaderDept/index.vue
@@ -18,7 +18,7 @@ const props = defineProps({
   }
 })
 
-const cascaderOptions = flatTreeToCascaderOption(props.options, { value: "deptId", label: "deptName" })
+const cascaderOptions = computed(() => flatTreeToCascaderOption(props.options, { value: "deptId", label: "deptName" }))
 
 const emit = defineEmits<{
   (e: "update:modelValue", value: Number): void
diff --git a/server/molly-pms/src/main/java/com/xaaef/molly/perms/api/impl/ApiOperateUserServiceImpl.java b/server/molly-pms/src/main/java/com/xaaef/molly/perms/api/impl/ApiOperateUserServiceImpl.java
index 0ab67be..3582bc3 100644
--- a/server/molly-pms/src/main/java/com/xaaef/molly/perms/api/impl/ApiOperateUserServiceImpl.java
+++ b/server/molly-pms/src/main/java/com/xaaef/molly/perms/api/impl/ApiOperateUserServiceImpl.java
@@ -3,6 +3,7 @@ package com.xaaef.molly.perms.api.impl;
 import cn.hutool.core.util.ReflectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xaaef.molly.common.consts.MbpConst;
+import com.xaaef.molly.common.util.TenantUtils;
 import com.xaaef.molly.internal.api.ApiOperateUserService;
 import com.xaaef.molly.internal.api.ApiSysTenantService;
 import com.xaaef.molly.internal.dto.OperateUserDTO;
@@ -67,6 +68,7 @@ public class ApiOperateUserServiceImpl implements ApiOperateUserService {
         }
     }
 
+
     @Override
     public Map<Long, OperateUserDTO> mapOperateUser(Set<Long> userIds) {
         var operateUserMaps = new HashMap<Long, OperateUserDTO>();
@@ -76,14 +78,18 @@ public class ApiOperateUserServiceImpl implements ApiOperateUserService {
         if (!defaultTenantUser.isEmpty()) {
             operateUserMaps.putAll(defaultTenantUser);
         }
-        // 从 当前租户中，获取 用户信息
-        var currentTenantUser = listOperateUser(userIds);
-        if (!currentTenantUser.isEmpty()) {
-            operateUserMaps.putAll(currentTenantUser);
+        // 如果当前是 非默认租户，
+        if (!(defaultTenantId).equals(TenantUtils.getTenantId())) {
+            // 从 当前租户中，获取 用户信息
+            var currentTenantUser = listOperateUser(userIds);
+            if (!currentTenantUser.isEmpty()) {
+                operateUserMaps.putAll(currentTenantUser);
+            }
         }
         return operateUserMaps;
     }
 
+
     private Map<Long, OperateUserDTO> listOperateUser(Set<Long> userIds) {
         var wrapper = new LambdaQueryWrapper<PmsUser>()
                 .select(List.of(PmsUser::getUserId, PmsUser::getAvatar, PmsUser::getNickname))
diff --git a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java
index 036165d..e9b1936 100644
--- a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java
+++ b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java
@@ -116,7 +116,7 @@ public class SysTenantServiceImpl extends BaseServiceImpl<SysTenantMapper, SysTe
     public IPage<SysTenant> simplePageKeywords(SearchPO params) {
         var wrapper = super.getKeywordsQueryWrapper(
                 params,
-                List.of(SysTenant::getName, SysTenant::getLinkman, SysTenant::getAddress)
+                List.of(SysTenant::getTenantId, SysTenant::getName, SysTenant::getLinkman)
         );
         wrapper.lambda().select(
                 List.of(SysTenant::getTenantId, SysTenant::getLogo, SysTenant::getName, SysTenant::getLinkman)
diff --git a/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java b/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
index c402564..037fcf4 100644
--- a/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
+++ b/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
@@ -122,14 +122,17 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
             }
         }
         if (StringUtils.isNotBlank(params.getKeywords()) && columns != null && !columns.isEmpty()) {
-            var index = 0;
-            for (SFunction<T, ?> column : columns) {
-                if (index == 0)
-                    wrapper.lambda().like(column, params.getKeywords());
-                else
-                    wrapper.lambda().or().like(column, params.getKeywords());
-                index++;
-            }
+            wrapper.and(childWrapper -> {
+                var index = 0;
+                for (SFunction<T, ?> column : columns) {
+                    if (index == 0) {
+                        childWrapper.lambda().like(column, params.getKeywords());
+                    } else {
+                        childWrapper.lambda().or().like(column, params.getKeywords());
+                    }
+                    index++;
+                }
+            });
         }
         return wrapper;
     }
diff --git a/tenant-web-ui/src/components/CascaderDept/index.vue b/tenant-web-ui/src/components/CascaderDept/index.vue
index 2e5ab9a..882fc83 100644
--- a/tenant-web-ui/src/components/CascaderDept/index.vue
+++ b/tenant-web-ui/src/components/CascaderDept/index.vue
@@ -19,7 +19,7 @@ const props = defineProps({
   }
 })
 
-const cascaderOptions = flatTreeToCascaderOption(props.options, { value: "deptId", label: "deptName" })
+const cascaderOptions = computed(() => flatTreeToCascaderOption(props.options, { value: "deptId", label: "deptName" }))
 
 const emit = defineEmits<{
   (e: "update:modelValue", value: Number): void