1109修改

101captain

2021-11-09 e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d

 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;
@@ -48,13 +49,18 @@
            administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
            administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
            administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
            administratorsUserVO.setCommunityId(comActCommiteeVO.getCommunityId());
            administratorsUserVO.setAreaId(comActCommiteeVO.getAreaId());
            administratorsUserVO.setPhone(comActCommiteeVO.getPhone());
            administratorsUserVO.setName(comActCommiteeVO.getName());
            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();
            }
            return R.fail("账号或手机号已存在");
        }
        return R.fail();
    }
@@ -63,26 +69,18 @@
    @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);
                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();
            }
        }
        return R.fail();
    }
@@ -95,12 +93,11 @@
            if(comActCommittee.getUserId()!=null){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActCommittee.getUserId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActCommitteeDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActCommitteeDao.deleteById(id);
                return R.ok();

            }
        }
        return R.fail("用户账号错误");