Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -31,11 +31,10 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
 
     /**
      * 楼盘列表
-     * @param page
      * @param
      * @return
      */
-    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<TaBuilding> buildingListSelect(@Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -141,10 +141,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
     @Override
     public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
-        Page<TaBuilding> page = new Page<>();
+//        Page<TaBuilding> page = new Page<>();
 //        page.setSize(pageSize == null ? 10 : pageSize);
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
 //        page.setRecords(building);
         return ResponseBean.success(building);
     }