wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'

Browse Source 
feat(REQ-3282): 单位列表查询加上identityType

See merge request universal/infrastructure/backend/orgmanax!17
This commit is contained in:
张弘昊 2024-12-24 02:30:24 +00:00
commit 3cfdb5d3f0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java
View File

@ -50,6 +50,8 @@ public class ListUnitReq extends PageReqV2 {
private Set<Long> identityIds; private Set<Long> identityIds;
@CriteriaField(field = "legalIdCard", operator = Operator.IN) @CriteriaField(field = "legalIdCard", operator = Operator.IN)
private Set<String> legalIdCards; private Set<String> legalIdCards;
@CriteriaField(field = "identityType", operator = Operator.EQ)
private Integer identityType;
/** /**
* TODO: 待实现 * TODO: 待实现
* 查询返回数据包含，逻辑删除数据，即查询未删除和已删除的数据。 * 查询返回数据包含，逻辑删除数据，即查询未删除和已删除的数据。

2
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
View File

@ -108,6 +108,8 @@ public interface UnitQueryRepository {
private Set<Long> identityIds; private Set<Long> identityIds;
@CriteriaField(field = "legalIdCard", operator = Operator.IN) @CriteriaField(field = "legalIdCard", operator = Operator.IN)
private Set<String> legalIdCards; private Set<String> legalIdCards;
@CriteriaField(field = "identityType", operator = Operator.EQ)
private Integer identityType;
} }
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)