From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 837c12b..1ba4fac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -70,12 +70,8 @@
//查询用户回答
List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO);
vos.forEach(vo->{
- if(vo.getType()==2){
+ if(vo.getType()==4){
vo.setAnswerContent(vo.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
- }
- if(vo.getType()==3){
- vo.setAnswerContent(vo.getAnswerContent().replaceAll(
- "(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
});
result.setAnswers(vos);
@@ -113,12 +109,8 @@
List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
if(!registerDetailedAnswerList.isEmpty()){
for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
- if(detailed.getType()==2){
+ if(detailed.getType()==4){
detailed.setAnswerContent(detailed.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
- }
- if(detailed.getType()==3){
- detailed.setAnswerContent(detailed.getAnswerContent().replaceAll(
- "(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
if(!detailed.getType().equals(5)){
if(detailed.getType().equals(1)){
--
Gitblit v1.7.1