From e61d2900cffe5cfa3f4af2f456310ed8e4196131 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 2 Jul 2024 10:37:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCompanyManagementController.java  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 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 de877dbd..fde30a7f 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
@@ -263,26 +263,21 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 * 分页列表查询 - 功能安全中心查询企业
 	 * (管理端查询dataSource = 1的数据；报名查询全部的数据)
-	 * @param payCompanyManagement 企业管理
 	 * @param pageNo 页数
 	 * @param pageSize 条数
-	 * @param req
-	 * @return
 	 */
 	@ApiOperation(value="功能安全中心查询企业", notes="功能安全中心查询企业")
 	@GetMapping(value = "/listSafetyCenter")
-	public Result<?> queryPageSafetyCenter(PayCompanyManagement payCompanyManagement,
-										  @RequestParam(name="projectId") String projectId,
+	public Result<?> queryPageSafetyCenter(@RequestParam(name="projectId") String projectId,
+										  @RequestParam(name="companyName",required = false) String companyName,
 										  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 										  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 										  HttpServletRequest req) {
-		if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
-			return Result.error("企业名称长度不能大于50个字符！");
-		}
 		SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
-		QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());
+		QueryWrapper<PayCompanyManagement> queryWrapper = new QueryWrapper<>();
 
 		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);
 		List<PayCompanyManagement> listPayCompanyManagement = pageList.getRecords();