合并冲突解决

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1726,35 +1726,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return userList;
     }
 
-    @Override
-    public List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId) {
-        LambdaQueryWrapper<IcResiUserEntity> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(IcResiUserEntity::getCustomerId, customerId)
-                .eq(IcResiUserEntity::getHomeId, houseId)
-                .select(
-                        IcResiUserEntity::getId,
-                        IcResiUserEntity::getHomeId,
-                        IcResiUserEntity::getName,
-                        IcResiUserEntity::getIsParty,
-                        IcResiUserEntity::getYhzgx,
-                        IcResiUserEntity::getGender,
-                        IcResiUserEntity::getMobile,
-                        IcResiUserEntity::getIdCard,
-                        IcResiUserEntity::getBirthday
-                )
-                .orderByAsc(IcResiUserEntity::getYhzgx, IcResiUserEntity::getCreatedTime, IcResiUserEntity::getId);
-
-        List<IcResiUserEntity> homeUserList = baseDao.selectList(lqw);
-        if (CollUtil.isEmpty(homeUserList)) {
-            return Lists.newArrayList();
-        }
-        homeUserList.forEach(
-                item -> item.setYhzgx(RelationshipEnum.getEnum(item.getYhzgx()).getName())
-        );
-
-        return ConvertUtils.sourceToTarget(homeUserList, HomeUserBriefResultDTO.class);
-    }
-
     @Override
     public List<Map<String, Object>> dynamicQuery(String customerId, String formCode, String resultTableName, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<ResiUserQueryValueDTO> conditions, String currentStaffAgencyId, String staffOrgPath) {
         // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);