diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java index feb004511..7660db331 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java @@ -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 orgIdList; + /** + * 是否只查询公司列表 + *

+ * true-查询结果只返回公司,false-查询结果返回公司或部门,如果没传这个参数,则都返回 + */ + @ChineseDescription("是否只查询公司列表") + private Boolean companySearchFlag; + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index 8c7a8c57d..2c75f03cd 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -415,6 +415,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl