lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改施工人员身份证转换

Browse Source
This commit is contained in:
lcj
2025-08-30 03:32:36 +08:00
parent a07792c8e3
commit 19fd73f4c8
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/IdCardEncryptorUtil.java
View File

@ -46,6 +46,9 @@ public class IdCardEncryptorUtil {
* @return 解密后的身份证号码
*/
public String decrypt(String encrypted) {
if (encrypted == null) {
return null;
}
return aes.decryptStr(encrypted);
}
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
View File

@ -672,7 +672,10 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
}
// 解密身份证号码
String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
String hide = "";
if (StringUtils.isNotEmpty(decrypt)) {
hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
}
constructionUserVo.setSfzNumber(hide);
// 隐藏手机号码
String hidePhone = DesensitizedUtil.mobilePhone(constructionUserVo.getPhone());
@ -814,7 +817,10 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
}
// 解密身份证号码
String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
String hide = null;
if (decrypt != null) {
hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
}
constructionUserVo.setSfzNumber(hide);
// 隐藏手机号码
String hidePhone = DesensitizedUtil.mobilePhone(constructionUserVo.getPhone());

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
View File

@ -14,18 +14,18 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusConstructionBlacklist;
import org.dromara.common.utils.IdCardEncryptorUtil;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.project.domain.BusConstructionBlacklist;
import org.dromara.project.domain.BusProjectTeamMember;
import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq;
import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq;
import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
import org.dromara.project.mapper.BusConstructionBlacklistMapper;
import org.dromara.project.service.IBusConstructionBlacklistService;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.project.service.IBusProjectService;
import org.dromara.project.service.IBusProjectTeamMemberService;
import org.dromara.common.utils.IdCardEncryptorUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -73,7 +73,10 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
BeanUtils.copyProperties(constructionBlacklist, vo);
// 解密身份证号码
String decrypt = idCardEncryptorUtil.decrypt(constructionBlacklist.getSfzNumber());
String hide = IdcardUtil.hide(decrypt, 11, 17);
String hide = null;
if (decrypt != null) {
hide = IdcardUtil.hide(decrypt, 11, 17);
}
vo.setSfzNumber(hide);
return vo;
}
@ -98,7 +101,10 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
BusConstructionBlacklistVo vo = new BusConstructionBlacklistVo();
BeanUtils.copyProperties(entity, vo);
String decrypt = idCardEncryptorUtil.decrypt(entity.getSfzNumber());
String hide = IdcardUtil.hide(decrypt, 11, 17);
String hide = null;
if (decrypt != null) {
hide = IdcardUtil.hide(decrypt, 11, 17);
}
vo.setSfzNumber(hide);
return vo;
}).toList();

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
View File

@ -288,7 +288,9 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
// 关联获取施工人员信息
Long memberId = projectTeamMember.getMemberId();
SysUserVo userVo = userService.selectUserById(memberId);
projectTeamMemberVo.setMemberName(userVo.getNickName());
if (userVo != null) {
projectTeamMemberVo.setMemberName(userVo.getNickName());
}
return projectTeamMemberVo;
}
@ -318,7 +320,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
sysUserLqw.select(SysUser::getUserId);
sysUserLqw.like(SysUser::getNickName, memberName);
List<SysUserVo> userVos = userService.selectUserListByNikeName(memberName);
if(!userVos.isEmpty()){
if (!userVos.isEmpty()) {
List<Long> userIds = userVos.stream().map(SysUserVo::getUserId).distinct().filter(Objects::nonNull).toList();
lqw.in(BusProjectTeamMember::getMemberId, userIds);
}