From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
index c1d5f10..d9dd9c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
@@ -115,7 +115,10 @@
@ApiOperation(value = "获取合同分页列表")
@GetMapping(value = "/contractListByTenantId")
public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
- return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class).eq(TContract::getTenantId, tenantId)));
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class)
+ .eq(!businessDeptId.equals("0"), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getTenantId, tenantId)));
}
/**
--
Gitblit v1.7.1