From a1488b8f2dfe014d3fa8badadd74bdee41d4bb66 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index b036969..1b32856 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -61,7 +61,7 @@
this.comActFourMemberDao.insert(comActFourMember);
return R.ok();
}
- return R.fail(r.getMsg());
+ return R.fail("手机号或账户已存在");
}
return R.fail("绑定管辖区域不能为空或重复");
}
@@ -73,15 +73,13 @@
if(comActFourMemberVO!=null){
if(comActFourMemberVO.getIds()!=null){
for(Integer id:comActFourMemberVO.getIds()){
- ComActFourMember comActFourMember=new ComActFourMember();
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
ComActFourMember comActFourMemberBase=this.comActFourMemberDao.selectById(id);
if(comActFourMemberBase!=null){
- comActFourMember.setId(comActFourMemberBase.getId());
- comActFourMember.setUserId(comActFourMemberBase.getUserId());
+ comActFourMemberVO.setUserId(comActFourMemberBase.getUserId());
+ BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
+ userService.putUserBackstage(administratorsUserVO);
}
- AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
- BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
- userService.putUserBackstage(administratorsUserVO);
}
return R.ok();
}
--
Gitblit v1.7.1