From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 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 e19f721..2370c6f 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
@@ -48,9 +48,11 @@
             administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
             administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
             administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
+            administratorsUserVO.setCommunityId(comActCommiteeVO.getCommunityId());
+            administratorsUserVO.setAreaId(comActCommiteeVO.getAreaId());
             R r=userService.addUserBackstageProperty(administratorsUserVO);
             if(R.isOk(r)){
-                comActCommiteeVO.setUserId(Long.parseLong(r.getData().toString()));
+                comActCommittee.setUserId(Long.parseLong(r.getData().toString()));
                 comActCommittee.setCreateTime(DateUtil.date());
                 this.comActCommitteeDao.insert(comActCommittee);
                 return R.ok();
@@ -63,26 +65,10 @@
     @Transactional(rollbackFor = Exception.class)
     public R update(ComActCommiteeVO comActCommiteeVO) {
         if(comActCommiteeVO!=null){
-            if(!comActCommiteeVO.getAccount().isEmpty()||!comActCommiteeVO.getPassword().isEmpty()){
-                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
-                administratorsUserVO.setUserId(comActCommiteeVO.getUserId());
-                administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
-                administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
-                R r=userService.putUserBackstage(administratorsUserVO);
-                if(R.isOk(r)){
-                    ComActCommittee comActCommittee=new ComActCommittee();
-                    BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
-                    this.comActCommitteeDao.updateById(comActCommittee);
-                    return R.ok();
-                }
-                return R.fail("账号密码修改失败");
-            }
-            else {
                 ComActCommittee comActCommittee=new ComActCommittee();
                 BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
                 this.comActCommitteeDao.updateById(comActCommittee);
                 return R.ok();
-            }
         }
         return R.fail();
     }
@@ -95,6 +81,7 @@
             if(comActCommittee.getUserId()!=null){
                 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);

--
Gitblit v1.7.1