傅行帆 преди 5 години
родител
ревизия
ed5e50cadd

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

@@ -97,8 +97,8 @@ public class TaBuildingController extends BaseController {
97 97
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
98 98
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
99 99
                                      @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
100
-        Map a = JWTUtils.getUserIdAndOrgId(request);
101
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
100
+        Map map = JWTUtils.getUserIdAndOrgId(request);
101
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,Integer.valueOf(map.get("orgId").toString()));
102 102
     }
103 103
 
104 104
     /**

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

@@ -35,7 +35,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
35 35
      * @param page
36 36
      * @return
37 37
      */
38
-    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);
38
+    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);
39 39
 
40 40
 
41 41
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

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

@@ -32,7 +32,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
32 32
      * @param pageSize
33 33
      * @return
34 34
      */
35
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
35
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
36 36
 
37 37
     /**
38 38
      * 楼盘详情

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

@@ -80,11 +80,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
80 80
         return ResponseBean.success(page);
81 81
     }
82 82
     @Override
83
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
83
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
84 84
         Page<TaBuilding> page = new Page<>();
85 85
         page.setSize(pageSize == null ? 10 : pageSize);
86 86
         page.setCurrent(pageNum == null ? 1 : pageNum);
87
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
87
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId);
88 88
         page.setRecords(building);
89 89
 
90 90
         return ResponseBean.success(page);

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

@@ -55,6 +55,9 @@
55 55
             <if test="isMain != null and isMain != ''">
56 56
                 and  ta_building.is_main = #{isMain}
57 57
             </if>
58
+            <if test="orgId != null and orgId != ''">
59
+                and  ta_building.org_id = #{orgId}
60
+            </if>
58 61
         </where>
59 62
         ORDER BY create_date DESC
60 63
     </select>