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

【8.0】【org】增加只查询公司信息列表的条件字段

pull/57/head
fengshuonan 2023-07-13 15:06:00 +08:00
parent 1800e75182
commit 9f5360de43
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
View File

@ -60,7 +60,8 @@ public class HrOrganizationRequest extends BaseRequest {
*/
@NotBlank(message = "组织编码不能为空", groups = {add.class, edit.class})
@ChineseDescription("组织编码")
@TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "hr_organization", columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true)
@TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "hr_organization",
columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true)
private String orgCode;
/**
@ -123,4 +124,12 @@ public class HrOrganizationRequest extends BaseRequest {
@ChineseDescription("组织机构id集合")
private Set<Long> orgIdList;
/**
* 是否只查询公司列表
* <p>
* true-查询结果只返回公司，false-查询结果返回公司或部门，如果没传这个参数，则都返回
*/
@ChineseDescription("是否只查询公司列表")
private Boolean companySearchFlag;
}

6
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
View File

@ -415,6 +415,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
queryWrapper.in(HrOrganization::getOrgId, subOrgIdListOneLevel);
}
// 如果有筛选公司的标识，则只查询公司列表
Boolean companySearchFlag = hrOrganizationRequest.getCompanySearchFlag();
if (ObjectUtil.isNotEmpty(companySearchFlag) && companySearchFlag) {
queryWrapper.eq(HrOrganization::getOrgType, OrgTypeEnum.COMPANY.getCode());
}
// 根据排序正序查询
queryWrapper.orderByAsc(HrOrganization::getOrgSort);