lidongdong
2023-07-05 f83f2cf8e7acc0931085fd9e09b0ca81ca99073e
x修改bug
2个文件已修改
46 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -60,7 +60,6 @@
        R r = communityService.addCommunity(comActVO);
        if (R.isOk(r)) {
//            ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            Long communityId = comActVO.getCommunityId();
            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
@@ -69,15 +68,6 @@
            administratorsUserVO.setName(comActVO.getContacts());
            administratorsUserVO.setStatus(comActVO.getState() + 1);
//            Long communityId = 1676409638368608257L;
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comActVO.getAccount());
//            administratorsUserVO.setPassword(comActVO.getPassword());
//            administratorsUserVO.setName(comActVO.getContacts());
//            administratorsUserVO.setStatus(comActVO.getState() + 1);
            administratorsUserVO.setType(3);
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setCommunityId(communityId);
@@ -85,28 +75,22 @@
            administratorsUserVO.setUserId(Snowflake.getId());
            administratorsUserVO.setAppid(this.getAppId());
            R r1 = userService.addUserBackstage(administratorsUserVO);
            addType(communityId,"资金公开");
            addType(communityId,"资产公开");
            addType(communityId,"资源公开");
            addType(communityId,"村集体经济组织项目");
            if (!R.isOk(r1)) {
    //                userService.deleteUserBackstage(administratorsUserVO);
                communityService.delectCommunity(communityId);
            }
//            R r1 = userService.addUserBackstage(administratorsUserVO);
//
//            if (!R.isOk(r1)) {
//    //                userService.deleteUserBackstage(administratorsUserVO);
//                communityService.delectCommunity(communityId);
//            }
//
//            if(R.isOk(r1))
//            {
//                addType(communityId,"资金公开");
//                addType(communityId,"资产公开");
//                addType(communityId,"资源公开");
//                addType(communityId,"村集体经济组织项目");
//            }
            if(R.isOk(r1))
            {
                addType(communityId,"资金公开");
                addType(communityId,"资产公开");
                addType(communityId,"资源公开");
                addType(communityId,"村集体经济组织项目");
            }
//            return r1;
            return r1;
        }
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -81,7 +81,9 @@
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
            ComActDO comActDO1 =
                comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName()));
                comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda()
                        .eq(ComActDO::getCommunityId, comActVO.getCommunityId())
                );
            BeanUtils.copyProperties(comActDO1, comActVO);
            return R.ok(comActVO);
        }