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 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 queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId()); + queryWrapper.like(StringUtils.isNotBlank(companyName),"pcm.company_name",companyName); Page page = new Page<>(pageNo, pageSize); IPage pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper); List listPayCompanyManagement = pageList.getRecords();