From 5f349fe34e3e33625f8593ec1b616f0c4528a12c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 10:33:45 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
index 2370c6f..00b6937 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
@@ -11,6 +11,7 @@
 import com.panzhihua.service_community.entity.ComActCommittee;
 import com.panzhihua.service_community.dao.ComActCommitteeDao;
 import com.panzhihua.service_community.entity.ComActSocialOrg;
+import com.panzhihua.service_community.entity.ComProperty;
 import com.panzhihua.service_community.service.ComActCommitteeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -57,6 +58,7 @@
                 this.comActCommitteeDao.insert(comActCommittee);
                 return R.ok();
             }
+            return R.fail("账号或手机号已存在");
         }
         return R.fail();
     }
@@ -67,6 +69,14 @@
         if(comActCommiteeVO!=null){
                 ComActCommittee comActCommittee=new ComActCommittee();
                 BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
+                if(comActCommiteeVO.getRoleId()!=null){
+                    ComActCommittee comPropertyBase=this.comActCommitteeDao.selectById(comActCommiteeVO.getId());
+                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+                    administratorsUserVO.setUserId(comPropertyBase.getUserId());
+                    administratorsUserVO.setLastLoginTime(DateUtil.date());
+                    administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
+                    this.userService.putUserBackstage(administratorsUserVO);
+                }
                 this.comActCommitteeDao.updateById(comActCommittee);
                 return R.ok();
         }
@@ -82,12 +92,10 @@
                 AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                 administratorsUserVO.setUserId(comActCommittee.getUserId());
                 administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
-                R r=userService.deleteUserBackstage(administratorsUserVO);
-                if(R.isOk(r)){
-                    this.comActCommitteeDao.deleteById(id);
-                    return R.ok();
-                }
-                return R.fail("账号删除失败");
+                userService.deleteUserBackstage(administratorsUserVO);
+                this.comActCommitteeDao.deleteById(id);
+                return R.ok();
+
             }
         }
         return R.fail("用户账号错误");

--
Gitblit v1.7.1