傅行帆 5 jaren geleden
bovenliggende
commit
ed5e50cadd

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Bestand weergeven

97
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
97
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
98
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
98
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
99
                                      @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
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 Bestand weergeven

35
      * @param page
35
      * @param page
36
      * @return
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
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
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 Bestand weergeven

32
      * @param pageSize
32
      * @param pageSize
33
      * @return
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 Bestand weergeven

80
         return ResponseBean.success(page);
80
         return ResponseBean.success(page);
81
     }
81
     }
82
     @Override
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
         Page<TaBuilding> page = new Page<>();
84
         Page<TaBuilding> page = new Page<>();
85
         page.setSize(pageSize == null ? 10 : pageSize);
85
         page.setSize(pageSize == null ? 10 : pageSize);
86
         page.setCurrent(pageNum == null ? 1 : pageNum);
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
         page.setRecords(building);
88
         page.setRecords(building);
89
 
89
 
90
         return ResponseBean.success(page);
90
         return ResponseBean.success(page);

+ 3
- 0
src/main/resources/mapper/TaBuildingMapper.xml Bestand weergeven

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