From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Mon, 23 May 2022 08:24:11 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w --- src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java index 730a856..e6bf922 100644 --- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java +++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java @@ -1339,7 +1339,10 @@ } //设置账号 - user.setAccount(user.getRealName()); + String realName = user.getRealName(); + String cardid = user.getCardid(); +// user.setAccount(user.getRealName()); + user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4)); //加密 user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6))); user.setCreateTime(new Date()); @@ -1477,6 +1480,7 @@ //返回的user,需处理敏感数据 User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class)); //敏感数据处理 + user1.setRealName(DesensitizedUtil.desensitizedName(user.getRealName())); user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid())); user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone())); user1.setRegistered(DesensitizedUtil.desensitizedAddress(user.getRegistered())); @@ -1592,7 +1596,10 @@ } //设置账号 - user.setAccount(user.getRealName()); + String realName = user.getRealName(); + String cardid = user.getCardid(); +// user.setAccount(user.getRealName()); + user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4)); //加密 user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6))); user.setCreateTime(new Date()); -- Gitblit v1.9.3