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

huanghongfa

2021-07-23 fbfd98f72387b567d5de150b3656f540d70c2be1

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

@@ -803,6 +803,7 @@
                populationHouseUserDO.setId(Snowflake.getId());
                populationHouseUserDO.setPopulId(populationDO.getId());
                populationHouseUserDO.setHouseId(houseEditDto.getId());
                populationHouseUserDO.setRelation(houseEditDto.getRelation());
                if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
                    houseId = houseEditDto.getId();//居住地
                }
@@ -834,19 +835,19 @@
            }
        }

        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
        if (comMngPopulationHouseUserDO != null) {
            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
            comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
        }else {
            comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
            comMngPopulationHouseUserDO.setId(Snowflake.getId());
            comMngPopulationHouseUserDO.setPopulId(vo.getId());
            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
            comMngPopulationHouseUserDO.setCreateAt(new Date());
            comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
        }
//        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
//                .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
//        if (comMngPopulationHouseUserDO != null) {
//            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
//            comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
//        }else {
//            comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
//            comMngPopulationHouseUserDO.setId(Snowflake.getId());
//            comMngPopulationHouseUserDO.setPopulId(vo.getId());
//            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
//            comMngPopulationHouseUserDO.setCreateAt(new Date());
//            comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
//        }
        if (populationDAO.updateById(populationDO) > 0) {
            return R.ok();
        } else {