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

pom.xml

@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-miniapp</artifactId>
-			<version>3.3.0</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -1,8 +1,16 @@
 package com.huiju.estateagents.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -10,7 +18,12 @@ import java.util.Map;
  * @date 2018-12-18
  */
 public class BaseController {
-	
+	@Autowired
+	private ITaUserService taUserService;
+
+	@Autowired
+	private ITaPersonBuildingService taPersonBuildingService;
+
 	/**
 	 * 获取orgId
 	 * @param request
@@ -59,4 +72,15 @@ public class BaseController {
 		
 		return null;
 	}
+
+	public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+		TaUser taUser = taUserService.getById(getUserId(request));
+		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+		List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+		if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
+			taPersonBuildingList = new ArrayList<>();
+		}
+		return taPersonBuildingList;
+	}
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -367,19 +367,18 @@ public class TaUserController extends BaseController {
         try {
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-            taUserQueryWrapper.eq("org_id",getOrgId(request));
-            taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
-            taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
-            taUserQueryWrapper.eq(null != status,"status",status);
-//            taUserQueryWrapper.ne("status", 9);
+            TaUser taUser = new TaUser();
+            taUser.setOrgId(getOrgId(request));
+            taUser.setUserName(userName);
+            taUser.setPhone(phone);
+            taUser.setStatus(status);
             if(null != isConsultant && isConsultant == 1){
-                taUserQueryWrapper.eq("is_consultant",true);
+                taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
-                taUserQueryWrapper.eq("is_consultant",false);
+                taUser.setIsConsultant(false);
             }
-//            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
-            IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
+
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
@@ -427,9 +426,18 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
-            TaPersonBuilding taPersonBuilding = taPersonBuildingService.getOne(taPersonBuildingQueryWrapper);
-            if (null != taPersonBuilding){
-                taUser.setBuildingId(taPersonBuilding.getBuildingId());
+            List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+            //非置业顾问可以授权多个项目
+            if (taPersonBuildingList.size() > 0){
+                if (taUser.getIsConsultant()){
+                    taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                }else {
+                    List<String> buildings = new ArrayList<>();
+                    taPersonBuildingList.forEach(e -> {
+                        buildings.add(e.getBuildingId());
+                    });
+                    taUser.setBuildingIds(buildings);
+                }
             }
             responseBean.addSuccess(taUser);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -198,4 +198,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
+
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 import java.util.Map;
@@ -51,4 +52,13 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId);
+
+    /**
+     * 分页查询用户列表
+     * @param pg
+     * @param taUser
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -364,11 +364,25 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		});
 		
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			taPersonBuilding.setUserId(taUser.getUserId());
+			taPersonBuilding.setCreateDate(LocalDateTime.now());
+			taPersonBuildingMapper.insert(taPersonBuilding);
+		}else{
+			//非置业顾问可授权多个项目
+			List<String> buildingIdList = taUser.getBuildingIds();
+			LocalDateTime nowTime = LocalDateTime.now();
+			buildingIdList.forEach(e -> {
+				TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+				taPersonBuilding.setBuildingId(e);
+				taPersonBuilding.setUserId(taUser.getUserId());
+				taPersonBuilding.setCreateDate(nowTime);
+				taPersonBuildingMapper.insert(taPersonBuilding);
+			});
+		}
+
 		return taUser;
 	}
 	
@@ -424,11 +438,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			taPersonBuilding.setUserId(taUser.getUserId());
+			taPersonBuilding.setCreateDate(LocalDateTime.now());
+			taPersonBuildingMapper.insert(taPersonBuilding);
+		}else {
+			//非置业顾问可授权多个项目
+			List<String> buildingIdList = taUser.getBuildingIds();
+			LocalDateTime nowTime = LocalDateTime.now();
+			buildingIdList.forEach(e -> {
+				TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+				taPersonBuilding.setBuildingId(e);
+				taPersonBuilding.setUserId(taUser.getUserId());
+				taPersonBuilding.setCreateDate(nowTime);
+				taPersonBuildingMapper.insert(taPersonBuilding);
+			});
+		}
 		
 		//更新person
 		TaPerson taPerson = new TaPerson();
@@ -512,6 +539,19 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return ResponseBean.success("操作成功!");
 	}
 
+	/**
+	 * 分页查询用户列表
+	 *
+	 * @param pg
+	 * @param taUser
+	 * @param personBuildingList
+	 * @return
+	 */
+	@Override
+	public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
+		return taUserMapper.seleUserList(pg,taUser,personBuildingList);
+	}
+
 	private boolean updateUserStatus(TaUser user) {
 		UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("user_id", user.getUserId());

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -2,7 +2,7 @@ package com.huiju.estateagents.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.IMiniAppService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@ public class WxUtils {
     }
 
     public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
         config.setAppid(taMiniapp.getMiniappId());
         config.setSecret(taMiniapp.getSecret());
         config.setToken(taMiniapp.getToken());

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

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -97,7 +98,9 @@ public class ExtendContentController extends BaseController {
                                           @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
             ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+
+        List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
+        QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(cityId != null, "city_id", cityId);
             queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
             queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
@@ -106,6 +109,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
+            queryWrapper.in(taPersonBuildingList.size() > 0,"building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

@@ -109,7 +109,7 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,getTaPersonBuildingListByUserId(request));
         return helpActivityList;
     }
 
@@ -135,7 +135,7 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "name", required = false) String name,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name,getTaPersonBuildingListByUserId(request));
         return helpActivityList;
     }
 

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

@@ -107,7 +107,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
                                      HttpServletRequest request){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request),getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -141,7 +141,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
                                            HttpServletRequest request){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getTaPersonBuildingListByUserId(request));
     }
 
     /**

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

@@ -130,7 +130,7 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 
@@ -155,7 +155,7 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPersonService;
@@ -27,6 +28,7 @@ import java.lang.invoke.ConstantCallSite;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -78,6 +80,8 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<TaPersonBuilding> taPersonBuildingListByUserId = getTaPersonBuildingListByUserId(request);
+
             //使用分页插件
 		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
@@ -87,6 +91,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            queryWrapper.in(taPersonBuildingListByUserId.size()>0,"building_id",taPersonBuildingListByUserId.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);

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

@@ -84,7 +84,7 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
                                    @RequestParam(value = "title", required = false) String title,
                                    @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId);
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 

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

@@ -60,7 +60,7 @@ public class TaNewsTypeController extends BaseController {
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        HttpServletRequest request){
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 

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

@@ -80,7 +80,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setTel(tel);
             taPointsExchange.setOrgId(getOrgId(request));
             
-            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange,getTaPersonBuildingListByUserId(request));
 
         }catch (Exception e){
             e.printStackTrace();

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

@@ -320,7 +320,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -342,7 +342,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request),getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -88,7 +88,7 @@ public class TaShareActivityController extends BaseController {
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request),getTaPersonBuildingListByUserId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -114,7 +114,7 @@ public class TaShareActivityController extends BaseController {
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name);
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name,getTaPersonBuildingListByUserId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/entity/TaMiniappTemplate.java

@@ -54,5 +54,13 @@ public class TaMiniappTemplate implements Serializable {
      */
     private Integer fieldNum;
 
+    /**
+     * 是否订阅消息
+     */
+    private Boolean isSubscribe;
 
+    /**
+     * 模板字段列表 | 分隔
+     */
+    private String tplFields;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -50,7 +50,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
-            "/api/wx/login",
+            "/api/wx/",
             "/api/wx/tdCity",
             "/api/admin/signin",
             "/api/taCheckin/activity",

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,7 +32,7 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     void updateActivityToUnStart();
 
@@ -54,5 +55,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,7 +30,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param selected
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId,@Param("activityStatus") String activityStatus);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId, @Param("activityStatus") String activityStatus,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 详情
@@ -87,5 +89,5 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     void updateProcessingActivity();
 
-    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
+    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -1,12 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
@@ -28,14 +27,15 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param page
      * @return
      */
-    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);
+    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,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 楼盘列表
      * @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);
+    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);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,5 +20,5 @@ import java.util.List;
 @Mapper
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
 	
-	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange);
+	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.PersonIntention;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.*;
@@ -32,8 +33,8 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status);
-    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
 

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -32,7 +33,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 活动助力添加
@@ -145,5 +146,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 
 import java.time.LocalDateTime;
@@ -27,7 +28,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 项目详情
@@ -138,5 +139,5 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param activityStatus
      * @return
      */
-    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
+    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId);
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 楼盘列表
@@ -31,7 +32,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
+    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);
 
     /**
      * 楼盘详情

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据Id查询资讯数据

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,7 +25,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据Id查询资讯类型数据

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分兑换记录  服务类
@@ -15,5 +18,5 @@ import com.huiju.estateagents.entity.TaPointsExchange;
  */
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
 	
-	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange);
+	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange, List<TaPersonBuilding> taPersonBuildingList);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
@@ -34,9 +35,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
+    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
 

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareActivity;
 
 import java.time.LocalDateTime;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface ITaShareActivityService extends IService<TaShareActivity> {
 
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 判断活动是否开始
@@ -42,7 +43,7 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
 }

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.HelpInitiateRecord;
-import com.huiju.estateagents.entity.HelpRecord;
-import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
@@ -56,10 +53,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     TaShareActivityMapper taShareActivityMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }
@@ -222,10 +219,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name,personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -76,57 +76,145 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
-
-        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_NOTICE, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_NOTICE);
+
+            // TODO
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { name, content, DateUtils.cutSecond(dt) };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
+
+            sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
+            return;
+        }
     }
     
     @Override
     public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-        
-        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_HELP, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_HELP);
+
+            // TODO
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { activityName, result };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+            sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
+            return;
+        }
     }
-    
+
     @Override
     public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-        
-        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_GROUP, toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_GROUP);
+
+            // TODO
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { activityName, result };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+            sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
+            return;
+        }
     }
 
     @Override
     public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword5", bizType, "#fffff"));
-        data.add(new WxMaTemplateData("keyword6", content, "#fffff"));
-
-        sendMessage("mainbiz", toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType("mainbiz", toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "mainbiz");
+
+            // TODO
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { custName, phone, sex, fromName, bizType, content };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword5", bizType, "#fffff"));
+            data.add(new WxMaTemplateData("keyword6", content, "#fffff"));
+
+            sendMessage("mainbiz", toUser, link, data);
+            return;
+        }
     }
 
     @Override
     public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
-
-        sendMessage("newCustomer", toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType("newCustomer", toUser.getMiniappId());
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "newCustomer");
+
+            // TODO
+            // 短信发送
+        };
+
+        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
+            String[] data = new String[] { custName, phone, sex, fromName };
+            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                // TODO
+                // 使用短信发送
+            }
+        } else {
+            List<WxMaTemplateData> data = new ArrayList<>();
+            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
+            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
+            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
+
+            sendMessage("newCustomer", toUser, link, data);
+            return;
+        }
     }
 
     @Override
@@ -220,6 +308,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
+    @Deprecated
     private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {
@@ -250,6 +339,54 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    private ResponseBean sendSubscribeMessage(TaMiniappTemplate tpl, TaPerson toUser, String link, String[] data) {
+        String appid = toUser.getMiniappId();
+        if (StringUtils.isEmpty(appid)) {
+            log.error("人员 {} 无对应来源小程序信息", toUser);
+            return ResponseBean.error("消息接收人无 appid 信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null == tpl) {
+            return ResponseBean.error("小程序未设置消息模板", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(tpl.getTplFields())) {
+            return ResponseBean.error("小程序消息模板未设置字段内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<WxMaSubscribeData> sendData = createMessageData(data, tpl.getTplFields());
+
+        WxMaSubscribeMessage message = WxMaSubscribeMessage.builder()
+                .templateId(tpl.getTplId())
+                .data(sendData)
+                .page(StringUtils.ifNull(link, CommConstant.MINIAPP_INDEX))
+                .toUser(toUser.getMiniOpenid())
+                .build();
+
+        try {
+            WxMaService wxService = wxUtils.getMiniApp(appid);
+            wxService.getMsgService().sendSubscribeMsg(message);
+
+            return ResponseBean.success("消息发送成功");
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    private List<WxMaSubscribeData> createMessageData(String[] list, String fieldsStr) {
+        List<WxMaSubscribeData> data = new ArrayList<>();
+        if (list == null || list.length == 0 || StringUtils.isEmpty(fieldsStr)) return data;
+
+        String[] fileds = fieldsStr.split("\\|");
+
+        int length = fileds.length > list.length ? list.length : fileds.length;
+        for (int i = 0; i < length; i++) {
+            data.add(new WxMaSubscribeData(fileds[i], list[i], "#fffff"));
+        }
+        return data;
+    }
+
     private TaMiniappTemplate getTplByType(String type, String appid) {
         TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
         return tpl;

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

@@ -74,12 +74,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());
@@ -383,12 +383,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
      * @return
      */
     @Override
-    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus) {
+    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
@@ -89,12 +91,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
 
     @Override
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
+    public ResponseBean buildingList(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.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId,taPersonBuildingList);
 
         if (null != buildings) {
             for(TaBuilding taBuilding: buildings) {
@@ -123,13 +125,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success(page);
     }
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
+    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.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);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
         page.setRecords(building);
-
         return ResponseBean.success(page);
     }
 

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

@@ -8,10 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaNews;
-import com.huiju.estateagents.entity.TaNewsType;
-import com.huiju.estateagents.entity.TaSave;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
@@ -23,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -58,7 +56,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -73,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -19,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -39,7 +42,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -49,6 +52,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
@@ -34,10 +35,10 @@ public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMap
 	 * @return
 	 */
 	@Override
-	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange) {
+	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange,List<TaPersonBuilding> taPersonBuildingList) {
 		Page page = new Page(pageNum,pageSize);
 		// 分页查询
-		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange);
+		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange,taPersonBuildingList);
 		page.setRecords(list);
 		return ResponseBean.success(page);
 	}

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

@@ -444,7 +444,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
 
@@ -492,7 +492,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
         }
 
     }
@@ -504,9 +504,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId){
+    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
+        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
     }
 
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -35,7 +37,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     private TaShareRecordMapper taShareRecordMapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -49,6 +51,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         queryWrapper.orderByDesc("heavy");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
@@ -83,7 +86,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -96,6 +99,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.like(!StringUtils.isEmpty(name), "activity_name", name);
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         queryWrapper.orderByAsc("activity_status");
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

src/main/resources/mapper/HelpActivityMapper.xml

@@ -29,6 +29,12 @@
             and ha.activity_status = #{activityStatus}
         </if>
             and ha.org_id=#{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND ha.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         </where>
         GROUP BY ha.help_activity_id
         order by ha.heavy desc
@@ -119,6 +125,12 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ha.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -45,6 +45,12 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND tbd.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         ORDER BY tbd.heavy DESC
   </select>
 
@@ -77,6 +83,12 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND tbd.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         ORDER BY tbd.heavy DESC
     </select>
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -29,6 +29,12 @@
             <if test="orgId != null">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ta_building.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         ORDER BY status ASC, create_date DESC
     </select>
@@ -59,6 +65,12 @@
             <if test="orgId != null and orgId != ''">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ta_building.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         ORDER BY create_date DESC,status asc
     </select>

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -58,6 +58,12 @@
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
             and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         order by t.create_date desc
     </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -70,6 +70,12 @@ FROM
         <if test="sex != null and sex !=''">
             and a.sex = #{sex}
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
     </where>
         order by a.create_date desc
     </select>
@@ -194,6 +200,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
     </select>

src/main/resources/mapper/TaUserMapper.xml

@@ -50,4 +50,33 @@
         and (phone = #{phone}
         OR login_Name = #{loginName})
     </select>
+    <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*,
+            b.building_id
+        FROM
+            ta_user t
+            LEFT JOIN ta_person_building b ON t.user_id = b.user_id
+        WHERE
+            t.org_id = #{taUser.orgId}
+            <if test="taUser.userName != null and taUser.userName != ''">
+                and t.user_name like CONCAT('%', #{taUser.userName}, '%')
+            </if>
+            <if test="taUser.phone != null and taUser.phone != ''">
+                and t.phone like CONCAT('%', #{taUser.phone}, '%')
+            </if>
+            <if test="taUser.status != null and taUser.status != ''">
+                and t.status = #{taUser.status}
+            </if>
+            <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
+                and t.is_consultant = #{taUser.isConsultant}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND b.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            GROUP BY user_id
+    </select>
 </mapper>