diff --git a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
index 47a62f1e..cc0470d0 100644
--- a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
+++ b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
@@ -11,7 +11,7 @@ public class CompanyDeptInfo {
     /**
      * 公司Id
      */
-    private Long companyId;
+    private String companyId;
     /**
      * 公司名称
      */
@@ -19,7 +19,7 @@ public class CompanyDeptInfo {
     /**
      * 部门Id
      */
-    private Long deptId;
+    private String deptId;
     /**
      * 部门名称
      */
diff --git a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java
index fcaa7bfb..474e1cd8 100644
--- a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java
+++ b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java
@@ -15,14 +15,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.singleton;
@@ -59,8 +52,8 @@ public class BusinessDeptHandleUtil {
             if (companyDeptSetByCompanyId.isEmpty()) {
                 // 当前公司下没有部门
                 CompanyDeptInfo data = new CompanyDeptInfo();
-                data.setCompanyId(Long.valueOf(companyIdHeader));
-                data.setDeptId(0L);
+                data.setCompanyId(companyIdHeader);
+                data.setDeptId("0");
                 return new HashSet<>(singleton(data));
             }
             // 如果有 deptId，校验其是否属于该 companyId
@@ -157,11 +150,11 @@ public class BusinessDeptHandleUtil {
         if (extraInfo == null) {
             return;
         }
-        Set<Long> companyIds = infos.stream()
+        Set<String> companyIds = infos.stream()
                 .map(CompanyDeptInfo::getCompanyId)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(LinkedHashSet::new));
-        Set<Long> deptIds = infos.stream()
+        Set<String> deptIds = infos.stream()
                 .map(CompanyDeptInfo::getDeptId)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(LinkedHashSet::new));
@@ -172,24 +165,24 @@ public class BusinessDeptHandleUtil {
 
     private static CompanyDeptInfo convert(CompanyDeptInfoRespDTO dto) {
         CompanyDeptInfo info = new CompanyDeptInfo();
-        info.setCompanyId(dto.getCompanyId());
+        info.setCompanyId(String.valueOf(dto.getCompanyId()));
         info.setCompanyName(dto.getCompanyName());
         info.setCompanyCode(dto.getCompanyCode());
-        info.setDeptId(dto.getDeptId());
+        info.setDeptId(String.valueOf(dto.getDeptId()));
         info.setDeptName(dto.getDeptName());
         info.setDeptCode(dto.getDeptCode());
         return info;
     }
 
     private static boolean applyAutoSelection(LoginUser loginUser, HttpServletRequest request, CompanyDeptInfo info) {
-        if (info == null || info.getCompanyId() == null || info.getCompanyId() <= 0
-                || info.getDeptId() == null || info.getDeptId() <= 0) {
+        if (info == null || info.getCompanyId() == null || "0".equals(info.getCompanyId())
+                || info.getDeptId() == null || "0".equals(info.getDeptId())) {
             return false;
         }
         if (loginUser != null) {
-            loginUser.setVisitCompanyId(info.getCompanyId());
+            loginUser.setVisitCompanyId(Long.valueOf(info.getCompanyId()));
             loginUser.setVisitCompanyName(info.getCompanyName());
-            loginUser.setVisitDeptId(info.getDeptId());
+            loginUser.setVisitDeptId(Long.valueOf(info.getDeptId()));
             loginUser.setVisitDeptName(info.getDeptName());
         }
         request.setAttribute(WebFrameworkUtils.HEADER_VISIT_COMPANY_ID, info.getCompanyId());
@@ -201,7 +194,7 @@ public class BusinessDeptHandleUtil {
             request.setAttribute(WebFrameworkUtils.HEADER_VISIT_DEPT_NAME, info.getDeptName());
         }
         CompanyContextHolder.setIgnore(false);
-        CompanyContextHolder.setCompanyId(info.getCompanyId());
+        CompanyContextHolder.setCompanyId(Long.valueOf(info.getCompanyId()));
         return true;
     }
 }