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

Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!61
This commit is contained in:
张弘昊 2024-12-27 10:21:36 +00:00
commit 4f7bce87eb

View File

@ -6,11 +6,13 @@ import cn.axzo.foundation.page.PageResp;
import cn.axzo.orgmanax.infra.dao.register.dao.OrganizationalUnitRegisterDao;
import cn.axzo.orgmanax.infra.dao.register.entity.OrganizationalUnitRegister;
import cn.axzo.orgmanax.infra.dao.register.repository.OrganizationalUnitRegisterQueryRepository;
import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper;
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 jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -31,6 +33,10 @@ public class OrganizationalUnitRegisterQueryRepositoryImpl implements Organizati
@Override
public PageResp<OrganizationalUnitRegisterResp> page(ListReq req) {
IPage<OrganizationalUnitRegister> page = PageConverter.toMybatis(req, OrganizationalUnitRegister.class);
//加密手机号
if (StringUtil.isNotBlank(req.getContactPhone())) {
req.setContactPhone(DataSecurityHelper.encrypt(req.getContactPhone()));
}
QueryWrapper<OrganizationalUnitRegister> wrapper = QueryWrapperHelper.fromBean(req, OrganizationalUnitRegister.class);
if (!BooleanUtil.isTrue(req.getIncludeDeleted())) {
wrapper.eq("is_delete", 0);