bugfix

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -98,6 +98,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                @RequestParam(defaultValue = "false" )boolean mine,
+                                               @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
         ResponseBean  responseBean = new ResponseBean();
@@ -109,7 +110,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
         }
 
         return responseBean;

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -51,7 +51,9 @@ public class TaPersonController extends BaseController {
     @GetMapping("/wx/cards")
     public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
                                     @RequestParam(defaultValue = "10") int pageSize,
-                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
+                                    @RequestParam(defaultValue = "false") boolean mine,
+                                    @RequestParam(value = "buildingId", required = false)String buildingId,
+                                    HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -65,7 +67,7 @@ public class TaPersonController extends BaseController {
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId);
             return ResponseBean.success(result);
         }
 

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

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status);
+    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -38,7 +38,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId);
 
     /**
      * 微信小程序 项目详情

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

@@ -24,7 +24,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson updatePersonPhone(String miniOpenid, String phone);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 

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

@@ -94,7 +94,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -107,6 +107,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
+        buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
@@ -130,8 +131,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
         // 当前阅读量加1
-        Integer saveNum = tabuildingDynamic.getSaveNum() == null ? 1:tabuildingDynamic.getSaveNum()+1;
-        tabuildingDynamic.setSaveNum(saveNum);
+        Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
+        tabuildingDynamic.setPvNum(saveNum);
         buildingDynamicMapper.updateById(tabuildingDynamic);
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
         TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);

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

@@ -159,13 +159,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId) {
         Page<Map<String, Object>> page = new Page<>();
         page.setSize(pageSize);
         page.setPages(pageNumber);
         page.setCurrent(pageNumber);
 
-        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId);
         page.setRecords(result);
 
         return page;

src/main/resources/mapper/TaPersonMapper.xml

@@ -13,9 +13,13 @@
             t.photo
         FROM
             ta_person t
+        LEFT JOIN ta_person_building p ON t.person_id = p.person_id
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        <if test="buildingId != null and buildingId != ''">
+            and p.building_id = #{buildingId}
+        </if>
         ORDER BY
             t.create_date DESC
     </select>