LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 86984 功能安全中心--项目会议--添加参会人选择成员单位页面建议只显示本级的成员单位

Browse Source
This commit is contained in:
lijiarao
2024-07-09 11:20:07 +08:00
parent a8ab4613c4
commit ee4fcd16f1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+7 -3
View File
@@ -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);
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+6 -1
View File
@@ -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);