Merge remote-tracking branch 'origin/huacheng' into huacheng

101captain

2022-04-26 93e4ecb6fa87a2418937cd2a6e557b0f6314794f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java

@@ -20,6 +20,8 @@
import javax.annotation.Resource;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

/**
 * (ComProperty)表服务实现类
@@ -50,18 +52,24 @@
        if(comPropertyVO!=null){
            ComProperty comProperty=new ComProperty();
            BeanUtils.copyProperties(comPropertyVO,comProperty);
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comPropertyVO.getAccount());
            administratorsUserVO.setPassword(comPropertyVO.getPassword());
            administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
            administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
            administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
            administratorsUserVO.setName(comPropertyVO.getContactName());
            administratorsUserVO.setPhone(comPropertyVO.getPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comProperty.setUserId(Long.parseLong(r.getData().toString()));
            if (isNotBlank(comPropertyVO.getAccount())) {
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setType(3);
                administratorsUserVO.setAccount(comPropertyVO.getAccount());
                administratorsUserVO.setPassword(comPropertyVO.getPassword());
                administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
                administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
                administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
                administratorsUserVO.setName(comPropertyVO.getContactName());
                administratorsUserVO.setPhone(comPropertyVO.getPhone());
                R r=userService.addUserBackstageProperty(administratorsUserVO);
                if(R.isOk(r)){
                    comProperty.setUserId(Long.parseLong(r.getData().toString()));
                    comProperty.setCreateTime(DateUtil.date());
                    this.comPropertyDao.insert(comProperty);
                    return R.ok();
                }
            } else {
                comProperty.setCreateTime(DateUtil.date());
                this.comPropertyDao.insert(comProperty);
                return R.ok();
@@ -99,9 +107,9 @@
                administratorsUserVO.setUserId(comProperty.getUserId());
                administratorsUserVO.setCommunityId(comProperty.getCommunityId());
                userService.deleteUserBackstage(administratorsUserVO);
                this.comPropertyDao.deleteById(id);
                return R.ok();
            }
            this.comPropertyDao.deleteById(id);
            return R.ok();
        }
        return R.fail("用户账号错误");
    }