diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java
index a507b973..aff980e6 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java
@@ -65,7 +65,16 @@ public class BpmOAExpensesController {
     @Operation(summary = "获得生产开支申请分页")
     @DataPermission(enable = false)
     public CommonResult<PageResult<BpmOAExpensesPageRespVO>> getExpensesPage(BpmOAExpensesPageReqVO pageReqVO) {
-
+        Long companyId =  pageReqVO.getFactoryId() ;
+        //1 = 113  中鼐智能科技（江西）有限公司,  10000083 = 136  世瑞华科技(深圳)有限公司     10000061 = 166 中鼐智能科技(江西)有限公司(高安)
+        if(companyId == 1L) {
+            companyId = 113L;
+        }else if(companyId == 10000083L)  {
+            companyId = 136L;
+        }else if(companyId == 10000061L ){
+            companyId = 166L ;
+        }
+        pageReqVO.setFactoryId(companyId) ;
         PageResult<BpmOAExpensesPageRespVO> respVO = expensesService.getExpensesPage(pageReqVO);
         return success(respVO);
     }
@@ -107,4 +116,4 @@ public class BpmOAExpensesController {
         expensesService.oneClickPayment(month);
         return success(true);
     }
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java
index 2e608ec5..d740ce3d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java
@@ -68,6 +68,16 @@ public class LoanController {
     @Operation(summary = "获得借支管理分页")
     @PreAuthorize("@ss.hasPermission('system:loan:query')")
     public CommonResult<PageResult<LoanRespVO>> getLoanPage(@Valid LoanPageReqVO pageReqVO) {
+        Long companyId =  pageReqVO.getDeptId() ;
+        //1 = 113  中鼐智能科技（江西）有限公司,  10000083 = 136  世瑞华科技(深圳)有限公司     10000061 = 166 中鼐智能科技(江西)有限公司(高安)
+        if(companyId == 1L) {
+            companyId = 113L;
+        }else if(companyId == 10000083L)  {
+            companyId = 136L;
+        }else if(companyId == 10000061L ){
+            companyId = 166L ;
+        }
+        pageReqVO.setDeptId(companyId) ;
         PageResult<LoanDO> pageResult = loanService.getLoanPage(pageReqVO);
         PageResult<LoanRespVO> result = BeanUtils.toBean(pageResult, LoanRespVO.class);
 
@@ -91,4 +101,4 @@ public class LoanController {
 
         return success(result);
     }
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index 10c0cc54..b5de8e88 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.user;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -482,10 +483,13 @@ public class UserController {
             companyId = 113L;
         }else if(companyId == 10000083L)  {
             companyId = 136L;
-        }else {
+        }else if(companyId == 10000061L ){
             companyId = 166L ;
         }
         List<DeptDO> deptDOS = deptService.getChildDept(companyId);
+        if(deptDOS == null){
+            throw new ServiceException(500, "公司ID，未查询到数据");
+        }
         List<AdminUserDO> userDOS = userService.getUserListByDeptIds(convertList(deptDOS, DeptDO::getId), CommonStatusEnum.ENABLE.getStatus());
         return success(BeanUtils.toBean(userDOS, UserSimpleRespVO.class));
     }