From 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 六月 2022 17:57:53 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index da626fe..81214ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -1111,15 +1111,15 @@
if(StringUtils.isEmpty(member.getCheckUnitName())){
member.setCheckUnitName("待编辑报到单位");
}
- member.setName(SensitiveUtil.replaceName(member.getName()));
+ //member.setName(SensitiveUtil.replaceName(member.getName()));
});
return R.ok(memberPage);
}
@Override
- public R getPartyMember(Long userId,Integer type) {
+ public R getPartyMember(String phone,Integer type) {
- return R.ok(comPbMemberDAO.selectDetail(userId,type));
+ return R.ok(comPbMemberDAO.selectDetail(phone,type));
}
@Override
--
Gitblit v1.7.1