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

feat(REQ-3282): unitList查询增加includeDeleted

Browse Source
This commit is contained in:
zhanghonghao 2024-12-25 15:13:34 +08:00
parent 8501568b39
commit 821d7ab143
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,8 @@ public interface UnitQueryRepository {
private Set<String> legalPhones;
@CriteriaField(field = "identityType", operator = Operator.EQ)
private Integer identityType;
@CriteriaField(ignore = true)
private Boolean includeDeleted;
}
@EqualsAndHashCode(callSuper = true)

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/impl/UnitQueryRepositoryImpl.java
View File

@ -8,6 +8,7 @@ import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.BooleanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
@ -27,6 +28,9 @@ public class UnitQueryRepositoryImpl implements UnitQueryRepository {
public PageResp<UnitResp> page(ListReq req) {
IPage<OrganizationalUnit> page = PageConverter.toMybatis(req, OrganizationalUnit.class);
QueryWrapper<OrganizationalUnit> wrapper = QueryWrapperHelper.fromBean(req, OrganizationalUnit.class);
if (!BooleanUtil.isTrue(req.getIncludeDeleted())) {
wrapper.eq("is_delete", 0);
}
IPage<UnitResp> results = unitDao.page(page, wrapper)
.convert(e -> BeanUtil.toBean(e, UnitResp.class));
PageResp<UnitResp> resp = PageConverter.toResp(results);