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 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 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 page = new Page<>(pageNo, pageSize); IPage 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 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 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);