Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -111,12 +111,12 @@ public class BaseController {
     /**
      * 获取组织机构id
      *
-     * @param request
+     * @param
      * @return
      */
-    public String getInstitutionId(HttpServletRequest request) {
-        TaUser taUser = taUserService.getById(getUserId(request));
-        return taUser.getInstitutionId();
+    public String getInstitutionId(String buildingId) {
+        TaBuilding building = taBuildingService.getById(buildingId);
+        return building.getInstitutionId();
     }
 
     /**
@@ -125,12 +125,9 @@ public class BaseController {
      * @param request
      * @return
      */
-    public List<String> getInstitutionCodes(HttpServletRequest request) {
+    public List<String> getInstitutionIds(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
-        Institution institution = iInstitutionService.getById(taUser.getInstitutionId());
-        LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
-        List<Institution> list = iInstitutionService.list(queryWrapper);
+        List<Institution> list = iInstitutionService.getAllByUser(taUser);
         return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
     }
 
@@ -173,17 +170,14 @@ public class BaseController {
         List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
 
         // 新的过滤条件组织机构
-        List<TaBuilding> list = taBuildingService.selectByUserId(taUser.getUserId());
-        for (TaBuilding taBuilding: list) {
-            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
-            taPersonBuilding.setUserId(taUser.getUserId());
-            taPersonBuildingList.add(taPersonBuilding);
-        }
+//        List<TaBuilding> list = taBuildingService.selectByUserId(taUser.getUserId());
+//        for (TaBuilding taBuilding: list) {
+//            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+//            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+//            taPersonBuilding.setUserId(taUser.getUserId());
+//            taPersonBuildingList.add(taPersonBuilding);
+//        }
 
-        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
-            taPersonBuildingList = new ArrayList<>();
-        }
         return taPersonBuildingList;
     }
 }

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,7 +22,9 @@ import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
+import com.yunzhi.marketing.xlk.service.IUserInstitutionService;
 import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +40,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -92,6 +96,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private IInstitutionService iInstitutionService;
 
+    @Autowired
+    private IUserInstitutionService userInstitutionService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -442,7 +449,7 @@ public class TaUserController extends BaseController {
             taUser.setMiniStatus(miniStatus);
             taUser.setJobNumber(jobNumber);
 
-            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
@@ -510,6 +517,11 @@ public class TaUserController extends BaseController {
                     taUser.setBuildingIds(buildings);
                 }
             }
+            // 绑定的组织机构返回
+            LambdaQueryWrapper<UserInstitution> institutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            institutionLambdaQueryWrapper.eq(UserInstitution::getUserId,id);
+            List<UserInstitution> list = userInstitutionService.list(institutionLambdaQueryWrapper);
+            taUser.setInstitutionIdLis(list.stream().map(UserInstitution::getInstitutionId).collect(Collectors.toList()));
             responseBean.addSuccess(taUser);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/center/taUser/mapper/TaUserMapper.java

@@ -29,7 +29,7 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("orgId") Integer orgId);
 
-    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("institutionIds") List<String> institutionIds);
 
     Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 

src/main/java/com/yunzhi/marketing/center/taUser/service/ITaUserService.java

@@ -65,7 +65,7 @@ public interface ITaUserService extends IService<TaUser> {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutionIds);
 
     /**
      * 获取用户信息

src/main/java/com/yunzhi/marketing/center/taUser/service/impl/TaUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.center.taUser.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,7 @@ import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.entity.UserInstitution;
 import com.yunzhi.marketing.xlk.mapper.UserInstitutionMapper;
+import me.chanjar.weixin.cp.bean.WxCpAgent;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -499,20 +501,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             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);
+            });
         }
-//        // 这个版本取消非置业顾问授权
-//        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;
     }
@@ -607,6 +607,26 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 更新这个用户的组织机构
+        List<String> institutionIdLis = taUser.getInstitutionIdLis();
+        if (institutionIdLis.size() > 0) {
+            // 先删除后新增
+            LambdaQueryWrapper<UserInstitution> userInstitutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userInstitutionLambdaQueryWrapper.eq(UserInstitution::getUserId,taUser.getUserId());
+            userInstitutionMapper.delete(userInstitutionLambdaQueryWrapper);
+            // 新增
+            institutionIdLis.forEach(e -> {
+                UserInstitution userInstitution = new UserInstitution();
+                userInstitution.setInstitutionId(e);
+                userInstitution.setOrgId(taUser.getOrgId());
+                userInstitution.setUserId(taUser.getUserId());
+                userInstitution.setCreateDate(LocalDateTime.now());
+                userInstitutionMapper.insert(userInstitution);
+
+            });
+        }
+
+
         //更新person
         TaPerson taPerson = new TaPerson();
         taPerson.setAvatarurl(taUser.getAvatar());
@@ -703,8 +723,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
      * @return
      */
     @Override
-    public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
-        return taUserMapper.seleUserList(pg, taUser, personBuildingList);
+    public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
+        return taUserMapper.seleUserList(pg, taUser, personBuildingList,institutionIds);
     }
 
     @Override

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -97,6 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
+            queryWrapper.in("institution_id",getInstitutionIds(request));
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
@@ -186,7 +187,10 @@ public class ExtendContentController extends BaseController {
             extendContent.setContentType("nothing");
         }
         extendContent.setCreateUser(getUserId(request));
-        extendContent.setInstitutionId(getInstitutionId(request));
+        if (StringUtils.isNotEmpty(extendContent.getBuildingId())) {
+            extendContent.setInstitutionId(getInstitutionId(extendContent.getBuildingId()));
+        }
+
         responseBean = iExtendContentService.extendContentAdd(extendContent);
         responseBean.addSuccess(extendContent);
         return responseBean;

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -109,7 +109,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), getTaPersonBuildingListByUserId(request));
+        return taBuildingService.buildingList(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -128,7 +128,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,getTaPersonBuildingListByUserId(request),type);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request),type,getInstitutionIds(request));
         return responseBean;
     }
 
@@ -459,7 +459,7 @@ public class TaBuildingDynamicController extends BaseController {
 //        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
-        dynamic.setInstitutionId(getInstitutionId(request));
+        dynamic.setInstitutionId(getInstitutionId(dynamic.getBuildingId()));
         //判断报名时间是否在活动时间之内
         if (dynamic.getEndDate().isBefore(dynamic.getEnlistEnd())){
             responseBean.addError("报名时间应在活动结束时间之前");

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -93,13 +93,12 @@ public class TaChannelController extends BaseController {
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-        Institution institution = iInstitutionService.getById(getInstitutionId(request));
 
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,institution.getInstitutionCode());
-            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, institution.getInstitutionCode());
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request));
+            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
 
             result.getRecords().stream().forEach(e -> {
                 for(TaChannel channel : recommendCount){
@@ -141,7 +140,6 @@ public class TaChannelController extends BaseController {
             int channelCode= taChannelMapper.channelCode();
             channel.setChannelCode(String.valueOf(channelCode));
             channel.setOrgId(orgId);
-            channel.setInstitutionId(getInstitutionId(request));
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -59,7 +59,7 @@ public class TaLiveActivityController extends BaseController {
      * @param liveActivityTitle 直播活动标题
      * @param cityId            所属城市
      * @param buildingId        所属楼盘
-     * @param liveDetailType    详情类型 0是模板，1是自定义
+     * @param
      * @param status            状态
      * @param source            查询来源，1:直播等活动，2:开屏广告
      * @param request
@@ -77,7 +77,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request), source);
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request), source, getInstitutionIds(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -103,7 +103,7 @@ public class TaLiveActivityController extends BaseController {
             taLiveActivity.setOrgId(orgId);
             taLiveActivity.setCreateUser(userId.toString());
             taLiveActivity.setUpdateUser(userId.toString());
-            taLiveActivity.setInstitutionId(getInstitutionId(request));
+            taLiveActivity.setInstitutionId(getInstitutionId(taLiveActivity.getBuildingId()));
             responseBean = iTaLiveActivityService.taLiveActivityAdd(taLiveActivity);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/controller/TaNewsController.java

@@ -81,13 +81,13 @@ 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,getTaPersonBuildingListByUserId(request));
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         return responseBean;
     }
 
     /**
      * 微信 分页查询列表
-     * @param pageNum
+     * @param
      * @param pageSize
      * @return
      */
@@ -129,7 +129,7 @@ public class TaNewsController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
         taNews.setOrgId(getOrgId(request));
-        taNews.setInstitutionId(getInstitutionId(request));
+        taNews.setInstitutionId(getInstitutionId(taNews.getBuildingId()));
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }

src/main/java/com/yunzhi/marketing/controller/TaNewsTypeController.java

@@ -57,7 +57,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),getTaPersonBuildingListByUserId(request));
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         return responseBean;
     }
 
@@ -72,7 +72,6 @@ public class TaNewsTypeController extends BaseController {
     })
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
-        taNewsType.setInstitutionId(getInstitutionId(request));
         ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
         return responseBean;
     }

src/main/java/com/yunzhi/marketing/controller/TaPolicyController.java

@@ -85,7 +85,7 @@ public class TaPolicyController extends BaseController {
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.eq("org_id", getOrgId(request));
-            queryWrapper.in("institution_id",getInstitutionCodes(request));
+            queryWrapper.in("institution_id",getInstitutionIds(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             List<TaPolicy> records = result.getRecords();
@@ -168,7 +168,7 @@ public class TaPolicyController extends BaseController {
             taPolicy.setStatus(1);
             taPolicy.setCreateDate(LocalDateTime.now());
             taPolicy.setOrgId(getOrgId(request));
-            taPolicy.setInstitutionId(getInstitutionId(request));
+            taPolicy.setInstitutionId(getInstitutionId(taPolicy.getBuildingId()));
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -469,7 +469,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            }
             return ResponseBean.success(taRecommendCustomerService.getCustomerList(status, pageNumber, pageSize, buildingId, name, tel, consultName,
                     consultTel, entryType, verifyStatus, sex, customerType, getOrgId(request), getTaPersonBuildingListByUserId(request), sceneType,
-                    startCreateDate, endCreateDate, sharePersonName, belongStatus));
+                    startCreateDate, endCreateDate, sharePersonName, belongStatus, getInstitutionIds(request)));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/controller/TdBuildingTypeController.java

@@ -80,8 +80,6 @@ public class TdBuildingTypeController extends BaseController {
             queryWrapper.eq("status", 1);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq("org_id", getOrgId(request));
-//            queryWrapper.in("institution_id",getInstitutionCodes(request));
-
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
@@ -115,7 +113,7 @@ public class TdBuildingTypeController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
+     * @param
      * @param pageSize
      * @return
      */

src/main/java/com/yunzhi/marketing/entity/TaNewsType.java

@@ -61,9 +61,7 @@ public class TaNewsType implements Serializable {
     private Integer status;
 
     /**
-     * 组织结构id
+     * 组织机构id
      */
     private String institutionId;
-
-
 }

src/main/java/com/yunzhi/marketing/mapper/TaBuildingDynamicMapper.java

@@ -27,10 +27,10 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
     /**
      * 会员列列表
      * @param page
-     * @param selected
+     * @param
      * @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,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("type") String type);
+    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,@Param("type") String type,@Param("institutionIds") List<String> institutions);
 
     /**
      * 详情

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -30,7 +30,7 @@ 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,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    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("institutionIds") List<String> institutionIds);
 
     /**
      * 楼盘列表

src/main/java/com/yunzhi/marketing/mapper/TaChannelMapper.java

@@ -44,9 +44,9 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param pg
      * @return
      */
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionCode") String institutionCode);
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
 
-    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionCode") String institutionCode);
+    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
 
     /**
      * 渠道引进客户统计

src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java

@@ -39,7 +39,8 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
                                                     @Param("orgId") Integer orgId,
                                                     @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
                                                     @Param("userId") Integer userId,
-                                                    @Param("source") Integer source);
+                                                    @Param("source") Integer source,
+                                                    @Param("institutionIds") List<String> institutions);
     /**
      * 批量更新直播活动状态
      *

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -34,7 +34,7 @@ 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, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
+    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, @Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName,@Param("institutionIds") List<String> institutionIds);
 
     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);
 
@@ -68,7 +68,8 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
                                           @Param("startCreateDate") String startCreateDate,
                                           @Param("endCreateDate") String endCreateDate,
                                           @Param("sharePersonName") String sharePersonName,
-                                          @Param("belongStatus") Integer belongStatus);
+                                          @Param("belongStatus") Integer belongStatus,
+                                          @Param("institutionIds") List<String> institutionIds);
 
     /**
      * 导出数据 获取推荐用户数据

src/main/java/com/yunzhi/marketing/service/ITaBuildingDynamicService.java

@@ -28,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, List<TaPersonBuilding> personBuildingList,String type);
+    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,String type,List<String> institutions);
 
     /**
      * 项目详情

src/main/java/com/yunzhi/marketing/service/ITaBuildingService.java

@@ -26,7 +26,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, List<TaPersonBuilding> taPersonBuildingList);
+    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, List<String> InstitutionIds);
 
     /**
      * 楼盘列表

src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java

@@ -43,7 +43,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
                                                       String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
-                                                      Integer userId,Integer source);
+                                                      Integer userId,Integer source,List<String> institutions);
 
     /**
      * 访问量自增

src/main/java/com/yunzhi/marketing/service/ITaNewsService.java

@@ -27,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, List<TaPersonBuilding> personBuildingList);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds);
 
     /**
      * 根据Id查询资讯数据

src/main/java/com/yunzhi/marketing/service/ITaNewsTypeService.java

@@ -25,7 +25,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds);
 
     /**
      * 根据Id查询资讯类型数据

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -41,7 +41,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     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, String sceneType, String startCreateDate, String endCreateDate,
-                          String sharePersonName, Integer belongStatus);
+                          String sharePersonName, Integer belongStatus,List<String> institutionIds);
 
     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);
 

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingDynamicServiceImpl.java

@@ -75,12 +75,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Override
     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,
-                                             String type) {
+                                             String type,List<String> institutions) {
         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,personBuildingList,type);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList,type,institutions);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -139,7 +139,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     private String MARKETING_CODE;
     @Override
-    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) {
+    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, List<String> InstitutionIds) {
         if (pageNum == null) {
             pageNum = 1;
         }
@@ -148,7 +148,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         Page<TaBuilding> page = new Page<>(pageNum, pageSize);
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList, InstitutionIds);
 
         if (null != buildings) {
             for (TaBuilding taBuilding : buildings) {

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -110,12 +110,12 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
                                                              String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
-                                                             Integer userId, Integer source) {
+                                                             Integer userId, Integer source, List<String> institutions) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{},iveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{},source:{}",
                 pageNum, pageSize, liveActivityTitle, cityId, buildingId, status, source);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId, taPersonBuildingListByUserId, userId, source);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId, taPersonBuildingListByUserId, userId, source, institutions);
     }
 
     @Override

src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java

@@ -55,7 +55,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, List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -70,6 +70,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("institution_id",institutionIds);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");

src/main/java/com/yunzhi/marketing/service/impl/TaNewsTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -52,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("institution_id",institutionIds);
         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);
@@ -99,6 +100,9 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsType.setCreateDate(LocalDateTime.now());
         taNewsType.setStatus(1);
         taNewsType.setOrgId(orgId);
+        String buildingId = taNewsType.getBuildingId();
+        TaBuilding building = iTaBuildingService.getById(buildingId);
+        taNewsType.setInstitutionId(building.getInstitutionId());
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -438,6 +438,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setOrgId(channelReportDTO.getOrgId());
         channelCustomer.setRemark(channelReportDTO.getRemark());
         channelCustomer.setRealtyConsultant(channelReportDTO.getRealtyConsultant());
+        channelCustomer.setInstitutionId(getInstitutionId(channelReportDTO.getBuildingId()));
         channelCustomerMapper.insert(channelCustomer);
 
         // 插入客户来源逻辑, 防止下面 if 里面的 return
@@ -591,6 +592,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             recommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
             recommendCustomer.setRecommendPerson(consultant.getPersonId());
             recommendCustomer.setCirculationTime(LocalDateTime.now());
+            recommendCustomer.setInstitutionId(building.getInstitutionId());
             customerFrom.setIsProjectFirst(true);
             customerFrom.setIsOrgFirst(true);
         }
@@ -664,10 +666,22 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setCreateDate(LocalDateTime.now());
         channelCustomer.setStatus("1");
         channelCustomer.setOrgId(averageReportDTO.getOrgId());
+        channelCustomer.setInstitutionId(getInstitutionId(averageReportDTO.getBuildingId()));
         channelCustomerMapper.insert(channelCustomer);
         return ResponseBean.success(channelCustomer);
     }
 
+    /**
+     * 获取组织机构id
+     *
+     * @param
+     * @return
+     */
+    public String getInstitutionId(String buildingId) {
+        TaBuilding building = taBuildingMapper.selectById(buildingId);
+        return building.getInstitutionId();
+    }
+
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
         customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         customer.setStatus(CommConstant.CUSTOMER_REPORT);
@@ -988,6 +1002,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setInstitutionId(getInstitutionId(params.getString("buildingId")));
 
         // 时间格式 yyyy-MM-dd
 //        String at = params.getString("appointmentTime");
@@ -1163,17 +1178,19 @@ 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, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName, Integer belongStatus) {
+    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, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName, Integer belongStatus,
+                                 List<String> institutionIds) {
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName, belongStatus);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName, belongStatus, institutionIds);
         } else {
             // 私客
             IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate, sharePersonName);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate, sharePersonName,institutionIds);
         }
 
     }

src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

@@ -74,9 +74,6 @@ public class BrandController extends BaseController {
             queryWrapper.eq(Brand::getOrgId,getOrgId(request));
             queryWrapper.like(!StringUtils.isEmpty(brandName),Brand::getBrandName,brandName);
             queryWrapper.orderByDesc(Brand::getCreatedTime);
-            if ("admin".equals(plat)) {
-                queryWrapper.in(Brand::getInstitutionId,getInstitutionCodes(request));
-            }
 
             IPage<Brand> result = iBrandService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -103,7 +100,6 @@ public class BrandController extends BaseController {
             brand.setCreatedTime(LocalDateTime.now());
             brand.setCreatedBy(getUserId(request));
             brand.setOrgId(getOrgId(request));
-            brand.setInstitutionId(getInstitutionId(request));
             if (iBrandService.save(brand)){
                 responseBean.addSuccess(brand);
             }else {

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -95,7 +95,7 @@ public class ChannelCustomerController extends BaseController {
                     phone,
                     recommendPersonName,
                     recommendPhone,
-                    status,type,getUserId(request));
+                    status,type,getUserId(request),getInstitutionIds(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -86,7 +86,7 @@ public class CurriculumController extends BaseController {
             queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
             queryWrapper.like(!StringUtils.isEmpty(name),Curriculum::getName,'%'+name+'%');
             queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
-            queryWrapper.in(Curriculum::getInstitutionId,getInstitutionCodes(request));
+            queryWrapper.in(Curriculum::getInstitutionId,getInstitutionIds(request));
             queryWrapper.orderByDesc(Curriculum::getWeight);
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
 
@@ -116,7 +116,6 @@ public class CurriculumController extends BaseController {
             curriculum.setCreatedTime(LocalDateTime.now());
             curriculum.setCreatedBy(getUserId(request));
             curriculum.setOrgId(getOrgId(request));
-            curriculum.setInstitutionId(getInstitutionId(request));
             if (iCurriculumService.save(curriculum)){
                 responseBean.addSuccess(curriculum);
             }else {

src/main/java/com/yunzhi/marketing/xlk/controller/TaPolicyTypeController.java

@@ -62,9 +62,6 @@ public class TaPolicyTypeController extends BaseController {
 		    IPage<TaPolicyType> pg = new Page<>(pageNum, pageSize);
             LambdaQueryWrapper<TaPolicyType> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(TaPolicyType::getOrgId,getOrgId(request));
-            if ("admin".equals(plat)) {
-                queryWrapper.in(TaPolicyType::getInstitutionId,getInstitutionCodes(request));
-            }
             queryWrapper.orderByDesc(TaPolicyType::getSort);
 
             IPage<TaPolicyType> result = iTaPolicyTypeService.page(pg, queryWrapper);
@@ -91,7 +88,6 @@ public class TaPolicyTypeController extends BaseController {
         try {
             taPolicyType.setOrgId(getOrgId(request));
             taPolicyType.setCreateDate(LocalDateTime.now());
-            taPolicyType.setInstitutionId(getInstitutionId(request));
             if (iTaPolicyTypeService.save(taPolicyType)){
                 responseBean.addSuccess(taPolicyType);
             }else {

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -77,7 +77,7 @@ public class VideoController extends BaseController {
             LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
             queryWrapper.eq(Video::getOrgId,getOrgId(request));
-            queryWrapper.in(Video::getInstitutionId,getInstitutionCodes(request));
+            queryWrapper.in(Video::getInstitutionId,getInstitutionIds(request));
             queryWrapper.orderByDesc(Video::getWeight);
             queryWrapper.orderByDesc(Video::getCreatedTime);
 
@@ -113,7 +113,7 @@ public class VideoController extends BaseController {
             video.setCreatedTime(LocalDateTime.now());
             video.setCreatedBy(getUserId(request));
             video.setOrgId(getOrgId(request));
-            video.setInstitutionId(getInstitutionId(request));
+            video.setInstitutionId(getInstitutionId(video.getBuildingId()));
             if (iVideoService.save(video)){
                 responseBean.addSuccess(video);
             }else {

src/main/java/com/yunzhi/marketing/xlk/dto/PcStatisticsDTO.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.dto;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class PcStatisticsDTO {
@@ -22,7 +23,7 @@ public class PcStatisticsDTO {
     /**
      * 组织机构code
      */
-    private String institutionCode;
+    private List<String> institutionIds;
 
     /**
      * 开始时间

src/main/java/com/yunzhi/marketing/xlk/entity/Brand.java

@@ -86,9 +86,4 @@ public class Brand implements Serializable {
      * 公司id
      */
     private Integer orgId;
-
-    /**
-     * 组织结构id
-     */
-    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/ChannelCustomer.java

@@ -112,6 +112,11 @@ public class ChannelCustomer implements Serializable {
      */
     private Integer channelId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     @TableField(exist = false)
     private String channelName;
 

src/main/java/com/yunzhi/marketing/xlk/entity/TaPolicyType.java

@@ -56,9 +56,4 @@ public class TaPolicyType implements Serializable {
     /** 颜色 */
     private String color ;
 
-    /**
-     * 组织机构code
-     */
-    private String institutionId;
-
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

@@ -33,7 +33,7 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
                                           @Param("recommendPersonName") String recommendPersonName,
                                           @Param("recommendPhone") String recommendPhone,
                                           @Param("status") String status,@Param("type") String type,
-                                          @Param("institutionCode") String institutionCode);
+                                          @Param("institutionIds") List<String> institutions);
 
     List<CustomerRankListVO> getRanklist(@Param("params") StatisticsDTO statisticsDTo);
 

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -6,6 +6,8 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 
+import java.util.List;
+
 /**
  * <p>
  * 渠道报备客户表  服务类
@@ -48,7 +50,8 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
                                           String recommendPhone,
                                           String status,
                                           String type,
-                                          Integer userId);
+                                          Integer userId,
+                                          List<String> institutions);
 
     /**
      * 驻场认筹

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -121,6 +122,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             taRecommendCustomer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
+            taRecommendCustomer.setInstitutionId(customer.getInstitutionId());
             taRecommendCustomerMapper.insert(taRecommendCustomer);
             // 审核通过
             customer.setStatus("2");
@@ -210,6 +212,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                 taRecommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
                 taRecommendCustomer.setCirculationTime(LocalDateTime.now());
+                taRecommendCustomer.setInstitutionId(customer.getInstitutionId());
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
 
                 // 审核通过
@@ -318,10 +321,9 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                                                  String phone,
                                                  String recommendPersonName,
                                                  String recommendPhone,
-                                                 String status,String type, Integer userId) {
-        TaUser taUser = taUserMapper.selectById(userId);
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-        return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status, type, institution.getInstitutionCode());
+                                                 String status, String type, Integer userId,
+                                                 List<String> institutions) {
+        return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status, type, institutions);
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/service/impl/IPcStatisticsServiceimpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaTagUser;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.dto.StatisticsDTO;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
@@ -21,10 +22,12 @@ import com.yunzhi.marketing.xlk.vo.PcStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class IPcStatisticsServiceimpl implements IPcStatisticsService {
@@ -35,6 +38,9 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Autowired
     private InstitutionMapper institutionMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 获取首页六个卡片的数值
      *
@@ -44,12 +50,10 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Override
     public ResponseBean getUserStatistics(TaUser taUser) {
         // 获取当前人员的渠道code
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-
         PcStatisticsDTO statisticsDTO = new PcStatisticsDTO();
         statisticsDTO.setOrgId(taUser.getOrgId());
         statisticsDTO.setTodayTime(LocalDateTime.now());
-        statisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        statisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 总用户
         int allPersonNum = pcStatisticsMapper.selectAllPerson(statisticsDTO);
         // 总注册用户
@@ -112,11 +116,10 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Override
     public ResponseBean getUserAuthorStatistics(TaUser taUser) {
         // 获取当前人员的渠道code
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
         PcStatisticsDTO statisticsDTO = new PcStatisticsDTO();
         statisticsDTO.setOrgId(taUser.getOrgId());
         statisticsDTO.setTodayTime(LocalDateTime.now());
-        statisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        statisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 总用户
         int allPersonNum = pcStatisticsMapper.selectAllPerson(statisticsDTO);
         // 总注册用户
@@ -136,8 +139,7 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
      */
     @Override
     public ResponseBean getStatsBarList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO) {
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-        pcStatisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        pcStatisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 获取公客排行榜
         List<PcStatisticsLeaderboardVO> gkList = pcStatisticsMapper.getGkLeaderboard(pcStatisticsDTO);
         // 获取私客排行榜
@@ -164,11 +166,21 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
      */
     @Override
     public ResponseBean selectActivityList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO) {
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-        pcStatisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        pcStatisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
 
         IPage<PcStatisticsActivityVO> page = new Page<>(pcStatisticsDTO.getPageNum(),pcStatisticsDTO.getPageSize());
         IPage<PcStatisticsActivityVO> result = pcStatisticsMapper.selectActivityList(page,pcStatisticsDTO);
         return ResponseBean.success(result);
     }
+
+    /**
+     * 获取组织机构id
+     *
+     * @param userId
+     * @return
+     */
+    public List<String> getInstitutionIds(Integer userId) {
+        List<Institution> list = institutionMapper.getAllByUser(userId);
+        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+    }
 }

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -48,6 +48,12 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tbd.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND tbd.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">

src/main/resources/mapper/TaBuildingMapper.xml

@@ -29,6 +29,12 @@
             <if test="orgId != null">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND ta_building.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND ta_building.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -769,7 +775,7 @@
         i.institution_id
         FROM
         xlk_institution i
-        INNER JOIN ( SELECT x.institution_code FROM xlk_user_institution t LEFT JOIN xlk_institution x ON t.institution_id = x.institution_id WHERE t.user_id = #{userId}) g ON i.institution_code LIKE g.institution_code
+        INNER JOIN ( SELECT x.institution_code FROM xlk_user_institution t LEFT JOIN xlk_institution x ON t.institution_id = x.institution_id WHERE t.user_id = #{userId}) g ON i.institution_code LIKE CONCAT(g.institution_code ,"%")
         )
     </select>
     <select id="getBuilidngsOfPerson" resultType="com.yunzhi.marketing.entity.TaBuilding">

src/main/resources/mapper/TaChannelMapper.xml

@@ -31,7 +31,13 @@
             </if>
             and c.org_id = #{orgId}
             and c.status = 1
-            AND i.institution_code like CONCAT(#{institutionCode}, '%')
+
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND c.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY c.channel_id
     </select>
@@ -44,14 +50,18 @@
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id and cp.`status` = 1
         LEFT JOIN ta_person t on cp.person_id = t.person_id and t.person_type in ('estate agent','channel agent')
-        LEFT JOIN xlk_institution i ON c.institution_id = i.institution_id
         LEFT JOIN ta_recommend_customer rc ON t.person_id = rc.recommend_person AND rc.verify_status = 1
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
             </if>
             and c.org_id = #{orgId}
-            AND i.institution_code like CONCAT(#{institutionCode}, '%')
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND c.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY c.channel_id
     </select>

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -62,6 +62,12 @@
                 #{personBuilding.buildingId}
             </foreach>
             or t.create_user = #{userId})
+        </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
             order by t.weight desc
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -227,6 +227,12 @@ FROM
                 and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName},
                 '%'))
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND a.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -294,6 +300,12 @@ FROM
                 and (t3.nickName like CONCAT('%',#{sharePersonName}, '%') or t3.name like CONCAT('%',#{sharePersonName},
                 '%'))
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND t.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND t.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">

src/main/resources/mapper/TaUserMapper.xml

@@ -66,7 +66,21 @@
             d.person_id as consultant_person_id,
             if(d.person_id is not null,1,0) as mini_status
         FROM
-            ta_user t
+            (SELECT
+                u.*
+                FROM
+                ta_user u
+                LEFT JOIN xlk_user_institution i ON u.user_id = i.user_id
+                WHERE
+                u.org_id = #{taUser.orgId}
+                <if test="institutionIds != null and institutionIds.size > 0">
+                    AND i.institution_id in
+                    <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                GROUP BY
+                u.user_id) t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
             LEFT JOIN ta_person d on t.user_id = d.user_id
         WHERE

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -11,11 +11,15 @@
         FROM
             xlk_channel_customer t
                 LEFT JOIN ta_building s ON t.building_id = s.building_id
-        LEFT JOIN xlk_institution i ON s.institution_id = i.institution_id
                 INNER JOIN ta_person m ON t.recommend_person = m.person_id
         WHERE
             t.org_id = #{orgId}
-            AND i.institution_code like CONCAT(#{institutionCode}, '%')
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
           <if test="buildingId != null and buildingId != ''">
               AND t.building_id = #{buildingId}
           </if>

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -30,10 +30,14 @@
             COUNT(1)
         FROM
             ta_channel t
-            LEFT JOIN xlk_institution i ON t.institution_id = i.institution_id
         WHERE
             t.org_id = #{params.orgId}
-<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="selectEstateAgentNum" resultType="java.lang.Integer">
         SELECT
@@ -66,7 +70,6 @@
         FROM
             ta_recommend_customer b
             LEFT JOIN ta_building d ON b.building_id = d.building_id
-            LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
             AND b.org_id = #{params.orgId}
@@ -82,7 +85,12 @@
             <if test="params.endTime != null">
                 and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
             </if>
-<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+            <if test="params.institutionIds != null and params.institutionIds.size > 0">
+                AND b.institution_id in
+                <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -95,7 +103,6 @@
         FROM
             ta_recommend_customer b
         LEFT JOIN ta_building d ON b.building_id = d.building_id
-        LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
         AND b.org_id = #{params.orgId}
@@ -112,7 +119,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND b.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -125,7 +137,6 @@
         FROM
             ta_uv a
             LEFT JOIN ta_building d ON a.be_uv = d.building_id
-            LEFT JOIN xlk_institution i ON d.institution_id = i.institution_id
         WHERE
             a.tagert_type = 'project'
             AND d.org_id = #{params.orgId}
@@ -139,7 +150,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND d.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
             a.be_uv
         ORDER BY
@@ -169,7 +185,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND b.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -223,7 +244,12 @@
         <if test="params.buildingId != null and params.buildingId != ''">
             and  t.building_id = #{params.buildingId}
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         order by t.create_date desc
     </select>
 </mapper>