魏熙美 преди 5 години
родител
ревизия
f46c04ce45

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Целия файл

@@ -73,8 +73,9 @@ public class TaBuildingController extends BaseController {
73 73
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
74 74
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
75 75
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
76
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
77
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
76
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
77
+                                     @RequestParam(value = "orgId",required = false)Integer orgId){
78
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
78 79
     }
79 80
 
80 81
     /**

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Целия файл

@@ -28,7 +28,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
28 28
      * @param page
29 29
      * @return
30 30
      */
31
-    List<TaBuilding> buildingList(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);
31
+    List<TaBuilding> buildingList(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);
32 32
 
33 33
     /**
34 34
      * 楼盘列表

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Целия файл

@@ -24,7 +24,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
24 24
      * @param pageSize
25 25
      * @return
26 26
      */
27
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
27
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId);
28 28
 
29 29
     /**
30 30
      * 楼盘列表

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Целия файл

@@ -70,11 +70,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
70 70
 
71 71
 
72 72
     @Override
73
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
73
+    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
74 74
         Page<TaBuilding> page = new Page<>();
75 75
         page.setSize(pageSize == null ? 10 : pageSize);
76 76
         page.setCurrent(pageNum == null ? 1 : pageNum);
77
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
77
+        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
78 78
         page.setRecords(building);
79 79
 
80 80
         return ResponseBean.success(page);

+ 3
- 0
src/main/resources/mapper/TaBuildingMapper.xml Целия файл

@@ -26,6 +26,9 @@
26 26
             <if test="isMain != null and isMain != ''">
27 27
                 and  ta_building.is_main = #{isMain}
28 28
             </if>
29
+            <if test="orgId != null">
30
+                and  ta_building.org_id = #{orgId}
31
+            </if>
29 32
         </where>
30 33
         ORDER BY create_date DESC
31 34
     </select>