submit

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/IdCardUtils.java

@@ -62,7 +62,10 @@ public class IdCardUtils {
      * @param idCard 身份证号码
      * @return 脱敏后的身份证（如：510***********1234）
      */
-    public static String maskIdCard(String idCard) {
+    public static String maskIdCard(String idCard,Integer sign) {
+        if (sign <= 0){
+            return idCard;
+        }
         if (idCard == null || idCard.trim().isEmpty()) {
             return "";
         }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/TelPhoneUtils.java

@@ -70,8 +70,11 @@ public class TelPhoneUtils
      * @param tel
      * @return
      */
-    public static String hideTelPhone(String tel)
+    public static String hideTelPhone(String tel,Integer sign)
     {
+        if (sign <= 0){
+            return tel;
+        }
         String phoneNumber = tel.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2");
         return phoneNumber;
     }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -262,6 +262,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public List<UserVo> selectList(UserQueryBo bo) {
         bo.setGetOrderNum(1L);
         List<UserVo> list = entity2UserVo(userMapper.selectListNoTenant(bo));
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         for (UserVo userVo : list) {
             userVo.setStudentCode(userVo.getUserAccount());
             ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
@@ -276,12 +278,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
             if (net.polyv.common.v1.util.StringUtils.isNotBlank(userVo.getIdCard())){
                 //身份证号脱敏
-                userVo.setIdCardStr(IdCardUtils.maskIdCard(userVo.getIdCard()));
+                userVo.setIdCardStr(IdCardUtils.maskIdCard(userVo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (net.polyv.common.v1.util.StringUtils.isNotBlank(userVo.getTelphone())){
                 //手机号脱敏
-                userVo.setTelphoneStr(TelPhoneUtils.hideTelPhone(userVo.getTelphone()));
+                userVo.setTelphoneStr(TelPhoneUtils.hideTelPhone(userVo.getTelphone(),tenant.getPwdSign()));
 
             }
            /* UserVisitLog userVisitLog = iUserVisitLogService.getOneNoTenant(userVo.getUserId());
@@ -463,17 +465,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
      * @return
      */
     private List<UserVo> entity2UserVo(Collection<User> collection) {
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         List<UserVo> voList = collection.stream()
                 .map(any ->{
                             UserVo vo = BeanUtil.toBean(any, UserVo.class);
                             if (StringUtils.isNotBlank(vo.getIdCard())){
                                 //身份证号脱敏
-                                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
                             }
 
                             if (StringUtils.isNotBlank(vo.getTelphone())){
                                 //手机号脱敏
-                                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
                             }
                             return vo;
@@ -814,7 +818,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User inertData = new User();
         inertData.setTelphone(bo.getTel());
         //隐藏手机号作为初始昵称
-        inertData.setNickname(TelPhoneUtils.hideTelPhone(bo.getTel()));
+        inertData.setNickname(TelPhoneUtils.hideTelPhone(bo.getTel(),1));
         //雪花算法产生账号ID
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         inertData.setUserAccount(String.valueOf(idWorker.nextId()));
@@ -891,7 +895,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         inertData.setTelphone(bo.getTel());
         inertData.setIdCard(bo.getIdcard());
         //隐藏手机号作为初始昵称
-        inertData.setNickname(TelPhoneUtils.hideTelPhone(bo.getTel()));
+        inertData.setNickname(TelPhoneUtils.hideTelPhone(bo.getTel(),1));
         //雪花算法产生账号ID
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         inertData.setUserAccount(String.valueOf(idWorker.nextId()));
@@ -1002,7 +1006,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             User inertData = new User();
             inertData.setTelphone(itemImport.getTelphone());
             //隐藏手机号作为初始昵称
-            inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getTelphone()));
+            inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getTelphone(),1));
             //雪花算法产生账号ID
             SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
             inertData.setUserAccount(String.valueOf(idWorker.nextId()));
@@ -1076,7 +1080,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User inertData = new User();
         inertData.setTelphone(itemImport.getTelphone());
         //隐藏手机号作为初始昵称
-        inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getTelphone()));
+        inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getTelphone(),1));
         //雪花算法产生账号ID
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         inertData.setUserAccount(String.valueOf(idWorker.nextId()));
@@ -1922,7 +1926,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             User inertData = new User();
             inertData.setTelphone(itemImport.getUserPhone());
             //隐藏手机号作为初始昵称
-            inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getUserPhone()));
+            inertData.setNickname(TelPhoneUtils.hideTelPhone(itemImport.getUserPhone(),1));
             //雪花算法产生账号ID
             SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
             inertData.setUserAccount(String.valueOf(idWorker.nextId()));

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -382,7 +382,7 @@ public class WxLoginService implements IWxLoginService {
         bo.setTelphone(tel);
         bo.setIdCard(idCard);
         //隐藏手机号作为初始昵称
-        bo.setNickname(TelPhoneUtils.hideTelPhone(tel));
+        bo.setNickname(TelPhoneUtils.hideTelPhone(tel,1));
         //雪花算法产生账号ID
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         bo.setUserAccount(String.valueOf(idWorker.nextId()));

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -36,6 +36,8 @@ import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.vo.UserVo;
@@ -106,6 +108,9 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     @Autowired
     private IInformRemindService informRemindService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
     @Value("${aliyun.sms.materialReviewCode}")
     private String materialReviewCode;
 
@@ -130,16 +135,18 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     @DataScope(businessAlias = "cb")
     public List<UserProfileVo> queryList(UserProfileQueryBo bo) {
         List<UserProfileVo> userProfileVos = baseMapper.selectUserProfile(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         if (CollectionUtils.isNotEmpty(userProfileVos)) {
             userProfileVos.forEach(vo -> {
                 if (StringUtils.isNotBlank(vo.getIdCard())){
                     //身份证号脱敏
-                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
                 }
 
                 if (StringUtils.isNotBlank(vo.getTelphone())){
                     //手机号脱敏
-                    vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                    vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
                 }
             });

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -2351,6 +2351,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public List<ClassPeriodStudentVo> listUserPeriodRecord(ClassGradeUserQueryBo bo) {
         //查询班级学员信息
         List<ClassPeriodStudentVo> classPeriodStudentVos = baseMapper.listUserPeriod(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         //查找学员学习记录
         for (ClassPeriodStudentVo classPeriodStudentVo : classPeriodStudentVos) {
             Long secLong = 0L;
@@ -2423,12 +2425,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
             if (StringUtils.isNotBlank(classPeriodStudentVo.getIdCard())){
                 //身份证号脱敏
-                classPeriodStudentVo.setIdCardStr(IdCardUtils.maskIdCard(classPeriodStudentVo.getIdCard()));
+                classPeriodStudentVo.setIdCardStr(IdCardUtils.maskIdCard(classPeriodStudentVo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (StringUtils.isNotBlank(classPeriodStudentVo.getTelPhone())){
                 //手机号脱敏
-                classPeriodStudentVo.setTelphoneStr(TelPhoneUtils.hideTelPhone(classPeriodStudentVo.getTelPhone()));
+                classPeriodStudentVo.setTelphoneStr(TelPhoneUtils.hideTelPhone(classPeriodStudentVo.getTelPhone(),tenant.getPwdSign()));
 
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -705,6 +705,8 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         if (CollectionUtils.isEmpty(orderSns)){
             return new ArrayList<>();
         }
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = sysTenantService.getById(Long.valueOf(tenantId));
         orderSns.forEach(item -> {
             OrderGoodsRefundQueryBo queryBo = new OrderGoodsRefundQueryBo();
             queryBo.setOrderSn(item.getOrderSn());
@@ -716,12 +718,12 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
 
             if (StringUtils.isNotBlank(item.getIdCard())){
                 //身份证号脱敏
-                item.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                item.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (StringUtils.isNotBlank(item.getTelphone())){
                 //手机号脱敏
-                item.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                item.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
             }
         });

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -32,7 +32,9 @@ import com.zhongzheng.modules.order.vo.CompanyStatisticsVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -74,6 +76,9 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
     @Autowired
     private IOrderHandleService iOrderHandleService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
 
     @Value("${invoice.host}")
     private String INVOICE_PATH;
@@ -317,11 +322,13 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
     @Override
     public List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo) {
         List<OrderInvoiceVo> orderInvoiceVos = baseMapper.selectListByBo(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         if (CollectionUtils.isNotEmpty(orderInvoiceVos)){
             for (OrderInvoiceVo vo : orderInvoiceVos) {
                 if (StringUtils.isNotBlank(vo.getIdCard())){
                     //身份证号脱敏
-                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
                 }
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -268,6 +268,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
         }
         List<OrderListVo> orderListVos = this.baseMapper.selectListByBo(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         for (OrderListVo vo : orderListVos) {
             if (Validator.isNotEmpty(vo.getRebuyOrderGoodsId()) && vo.getRebuyOrderGoodsId().longValue() > 0) {
                 vo.setRebuy(this.baseMapper.getGradePeriod(vo.getRebuyOrderGoodsId(), vo.getUserId()));
@@ -287,12 +289,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             if (StringUtils.isNotBlank(vo.getIdCard())){
                 //身份证号脱敏
-                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (StringUtils.isNotBlank(vo.getTelphone())){
                 //手机号脱敏
-                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
             }
 
@@ -367,6 +369,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public List<OrderListVo> selectRebuyList(OrderQueryBo bo) {
         List<OrderListVo> orderListVos = this.baseMapper.selectRebuyList(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         for (OrderListVo vo : orderListVos) {
             if (Validator.isNotEmpty(vo.getRebuyOrderGoodsId()) && vo.getRebuyOrderGoodsId().longValue() > 0) {
                 vo.setRebuy(this.baseMapper.getGradePeriod(vo.getRebuyOrderGoodsId(), vo.getUserId()));
@@ -385,12 +389,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             if (StringUtils.isNotBlank(vo.getIdCard())){
                 //身份证号脱敏
-                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (StringUtils.isNotBlank(vo.getTelphone())){
                 //手机号脱敏
-                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
             }
         }
@@ -3575,7 +3579,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 User data = new User();
                 data.setTelphone(orderBo.getUserTel());
                 //隐藏手机号作为初始昵称
-                data.setNickname(TelPhoneUtils.hideTelPhone(orderBo.getUserTel()));
+                data.setNickname(TelPhoneUtils.hideTelPhone(orderBo.getUserTel(),1));
                 //雪花算法产生账号ID
                 SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
                 data.setUserAccount(String.valueOf(idWorker.nextId()));
@@ -3797,6 +3801,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
         }
         List<OrderListVo> orderListVos = this.baseMapper.selectWithoutListByBo(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         for (OrderListVo vo : orderListVos) {
             if (Validator.isNotEmpty(vo.getRebuyOrderGoodsId()) && vo.getRebuyOrderGoodsId().longValue() > 0) {
                 vo.setRebuy(this.baseMapper.getGradePeriod(vo.getRebuyOrderGoodsId(), vo.getUserId()));
@@ -3816,12 +3822,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             if (StringUtils.isNotBlank(vo.getIdCard())){
                 //身份证号脱敏
-                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
             }
 
             if (StringUtils.isNotBlank(vo.getTelphone())){
                 //手机号脱敏
-                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone(),tenant.getPwdSign()));
 
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -137,4 +137,6 @@ private static final long serialVersionUID=1L;
     private Integer fastForwardSign;
     /** 培训学校名称*/
     private String schoolName;
+    /** 是否隐藏密码：1是 0否*/
+    private Integer pwdSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -982,6 +982,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
         }
         List<UserSubscribeVo> userSubscribeVos = baseMapper.listSubscribe(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         if (CollectionUtils.isNotEmpty(userSubscribeVos)) {
             userSubscribeVos.forEach(item -> {
                 Goods goods = iGoodsService.getById(item.getGoodsId());
@@ -993,7 +995,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 item.setBusinessName(business.getBusinessName());
                 if (!StringUtils.isEmpty(item.getIdCard())){
                     //身份证号脱敏
-                    item.setIdCardStr(IdCardUtils.maskIdCard(item.getIdCard()));
+                    item.setIdCardStr(IdCardUtils.maskIdCard(item.getIdCard(),tenant.getPwdSign()));
                 }
 
             });
@@ -2143,11 +2145,13 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Override
     public List<UserSubscribeVo> listSubscribeByUser(UserSubscribeQueryBo bo) {
         List<UserSubscribeVo> userSubscribeVos = baseMapper.listSubscribeByUser(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
         if (CollectionUtils.isNotEmpty(userSubscribeVos)){
             userSubscribeVos.forEach(vo -> {
                 if (!StringUtils.isEmpty(vo.getIdCard())){
                     //身份证号脱敏
-                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard(),tenant.getPwdSign()));
                 }
             });
         }