From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 01 八月 2022 14:46:47 +0800 Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java index b1e7012..1b8b4cb 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java @@ -58,7 +58,6 @@ @Override public R detailHouse(Long userId) { List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>(); - if (userId < 100000000l) { List<ComMngStructHouseUserDO> comMngStructHouseUserDOS = comMngStructHouseUserDAO.selectList( new QueryWrapper<ComMngStructHouseUserDO>().lambda().eq(ComMngStructHouseUserDO::getUserId, userId)); if (!ObjectUtils.isEmpty(comMngStructHouseUserDOS)) { @@ -77,23 +76,6 @@ }); return R.ok(comMngStructHouseVOS); } - } else { - userId = userId - 100000000l; - // 查导入人员的房屋 - Map<String, Object> map = comMngStructHouseUserDAO.selectHouseCode(userId); - String houseCode = map.get("house_code").toString(); - String isRent = map.get("is_rent").toString(); - ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne( - new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, houseCode)); - ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); - BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO); - if (isRent.equals("1")) { - comMngStructHouseVO.setIdentity(1); - } else { - comMngStructHouseVO.setIdentity(2); - } - comMngStructHouseVOS.add(comMngStructHouseVO); - } return R.ok(comMngStructHouseVOS); } -- Gitblit v1.7.1