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

Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282

Browse Source
This commit is contained in:
liuyang 2024-12-25 14:18:17 +08:00
commit a77ee4de8a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java
View File

@ -1,5 +1,6 @@
package cn.axzo.orgmanax.infra.dao.nodeuser.entity;
import cn.axzo.trade.datasecurity.core.annotation.CryptField;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -59,6 +60,7 @@ public class OrganizationalNodeUser implements Serializable {
/**
* 主电话
*/
@CryptField
private String phone;
/**
@ -69,6 +71,7 @@ public class OrganizationalNodeUser implements Serializable {
/**
* 身份证号
*/
@CryptField
private String idNumber;
/**

6
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/repository/impl/NodeUserQueryRepositoryImpl.java
View File

@ -6,6 +6,7 @@ import cn.axzo.foundation.page.PageResp;
import cn.axzo.orgmanax.infra.dao.nodeuser.dao.NodeUserDao;
import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser;
import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
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;
@ -34,11 +35,12 @@ public class NodeUserQueryRepositoryImpl implements NodeUserQueryRepository {
// 查询参数处理 ~
// keyword
if (StrUtil.isNotBlank(req.getKeyword())) {
String encryptedKeyword = DataSecurityHelper.encrypt(req.getKeyword());
wrapper.and(w -> {
w.like("real_name", req.getKeyword())
.or().eq("phone", req.getKeyword())
.or().eq("phone", encryptedKeyword)
.or().eq("job_number", req.getKeyword())
.or().eq("phone", req.getKeyword());
.or().eq("id_number", encryptedKeyword);
});
}
// 处理删除标记

3
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java
View File

@ -1,5 +1,6 @@
package cn.axzo.orgmanax.infra.dao.orguser.entity;
import cn.axzo.trade.datasecurity.core.annotation.CryptField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -46,6 +47,7 @@ public class OrgUser implements Serializable {
/**
* 手机号,加密
*/
@CryptField
private String phone;
/**
@ -56,6 +58,7 @@ public class OrgUser implements Serializable {
/**
* 身份证号
*/
@CryptField
private String idNumber;
/**