From ee4fcd16f131553b35a6e538090b173652e1a47d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 11:20:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086984=20=E5=8A=9F=E8=83=BD=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE--=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BB=BA=E8=AE=AE=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=AC?=
 =?UTF-8?q?=E7=BA=A7=E7=9A=84=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCompanyManagementController.java     | 10 +++++++---
 .../controller/PayContactsManagementController.java    |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index fde30a7f..a5ac1aac 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -262,21 +262,25 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 
 	/**
 	 * 分页列表查询 - 功能安全中心查询企业
-	 * (管理端查询dataSource = 1的数据；报名查询全部的数据)
+	 *
 	 * @param pageNo 页数
 	 * @param pageSize 条数
 	 */
 	@ApiOperation(value="功能安全中心查询企业", notes="功能安全中心查询企业")
 	@GetMapping(value = "/listSafetyCenter")
 	public Result<?> queryPageSafetyCenter(@RequestParam(name="projectId") String projectId,
+										   @RequestParam(name="type",required = false) String type,
 										  @RequestParam(name="companyName",required = false) String companyName,
 										  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 										  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 										  HttpServletRequest req) {
 		SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
 		QueryWrapper<PayCompanyManagement> queryWrapper = new QueryWrapper<>();
-
-		queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId());
+		if ("2".equals(type)){
+			queryWrapper.eq("pfscs.project_id",safetyCenter.getId());
+		}else {
+			queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId());
+		}
 		queryWrapper.like(StringUtils.isNotBlank(companyName),"pcm.company_name",companyName);
 		Page<PayCompanyManagement> page = new Page<>(pageNo, pageSize);
 		IPage<PayCompanyManagement> pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index a43b0822..15f0ada4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -830,6 +830,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 @ApiOperation(value="功能安全中心查询企业查询用户", notes="功能安全中心查询企业查询用户")
 	 @GetMapping(value = "/queryBySafetyCenter")
 	 public Result<?> queryBySafetyCenter(@RequestParam(name="projectId") String projectId,
+										  @RequestParam(name="type",required = false) String type,
 										  @RequestParam(name="companyId",required = false) String companyId,
 										  @RequestParam(name="name",required = false) String name) {
 		 if (StringUtils.isBlank(companyId)||StringUtils.isBlank(projectId)){
@@ -838,7 +839,11 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		 SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
 
 		 QueryWrapper<PayContactsManagement> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId());
+		 if ("2".equals(type)){
+			 queryWrapper.eq("pfscsc.project_id", safetyCenter.getId());
+		 }else {
+			 queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId());
+		 }
 		 queryWrapper.eq("pfscsc.company_id", companyId);
 		 if(!StringUtils.isEmpty(name)){
 			 queryWrapper.like("pcm.name", name);