Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-28 22a8cf0fc39555be78a030d208215fa7f6ad6bc4

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

@@ -96,11 +96,13 @@
        if (!carResult) {
            return R.fail("车牌号有误！");
        }
        if (comMngCarSaveDTO.getId()==null) {
        ComMngCarDO exist = comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
                .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()));
        if (exist != null) {
            return R.ok("车辆已存在");
        }
        }
        ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId());
        if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
            return R.fail("小区不存在");