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 aff980e6..511ee44f 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
@@ -66,15 +66,17 @@ public class BpmOAExpensesController {
     @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 ;
+        if(companyId != null) {
+            //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) ;
         }
-        pageReqVO.setFactoryId(companyId) ;
         PageResult<BpmOAExpensesPageRespVO> respVO = expensesService.getExpensesPage(pageReqVO);
         return success(respVO);
     }
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 d740ce3d..24c1da21 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
@@ -69,15 +69,18 @@ public class LoanController {
     @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 ;
+        if(companyId != null) {
+            //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) ;
         }
-        pageReqVO.setDeptId(companyId) ;
+
         PageResult<LoanDO> pageResult = loanService.getLoanPage(pageReqVO);
         PageResult<LoanRespVO> result = BeanUtils.toBean(pageResult, LoanRespVO.class);