gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

组织结构增加税号查询条件

pull/39/head
ye_star 2022-10-14 17:23:07 +08:00
parent d60958acec
commit 3b78f2179f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
View File

@ -447,6 +447,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
Long orgParentId = hrOrganizationRequest.getOrgParentId(); Long orgParentId = hrOrganizationRequest.getOrgParentId();
Long orgId = hrOrganizationRequest.getOrgId(); Long orgId = hrOrganizationRequest.getOrgId();
Integer orgType = hrOrganizationRequest.getOrgType(); Integer orgType = hrOrganizationRequest.getOrgType();
String taxNo = hrOrganizationRequest.getTaxNo();
// 拼接组织机构名称条件 // 拼接组织机构名称条件
queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName); queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName);
@ -457,6 +458,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
// 组织机构类型拼接 // 组织机构类型拼接
queryWrapper.eq(ObjectUtil.isNotEmpty(orgType), HrOrganization::getOrgType, orgType); queryWrapper.eq(ObjectUtil.isNotEmpty(orgType), HrOrganization::getOrgType, orgType);
// 税号查询条件
queryWrapper.eq(StrUtil.isNotEmpty(taxNo), HrOrganization::getTaxNo, taxNo);
// 拼接父机构id查询条件 // 拼接父机构id查询条件
if (ObjectUtil.isNotEmpty(orgParentId)) { if (ObjectUtil.isNotEmpty(orgParentId)) {
queryWrapper.and(qw -> { queryWrapper.and(qw -> {