bug 修复

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

@@ -119,6 +119,21 @@ public class BaseController {
         return taUser.getInstitutionId();
     }
 
+    /**
+     * 获取组织机构id
+     *
+     * @param request
+     * @return
+     */
+    public List<String> getInstitutionCodes(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);
+        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+    }
+
     /**
      * 获取服务管理后台用户ID
      *

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUserVO.java

@@ -0,0 +1,292 @@
+package com.yunzhi.marketing.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录账户
+     */
+    private String loginName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 账户过期时间
+     */
+    private LocalDateTime expDate;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    private String orgName;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+    
+    private String address;
+    private String photo;
+    private String description;
+
+    /**
+     * 工号
+     */
+    private String jobNumber;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
+    /**
+     * 组织机构编号
+     */
+    @TableField(exist = false)
+    private List<String> institutionIdLis;
+
+    /**
+     * 当前人员拥有的所有组织权限
+     */
+    @TableField(exist = false)
+    private List<Institution> institutionList;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy= FieldStrategy.IGNORED)
+    private String weight;
+
+    /**
+     * 是否置业顾问
+     */
+    private Boolean isConsultant;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
+
+    /**
+     * 关联小程序
+     */
+    @TableField(exist = false)
+    private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
+
+    /**
+     * 授权按钮列表
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> buttons;
+    
+    @TableField(exist = false)
+    private List<TaTags> taTagsList = new ArrayList<TaTags>();
+    
+    @TableField(exist = false)
+    private List<Integer> taTags = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private String buildingId;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+  @TableField(exist = false)
+    private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<String> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
+
+    /**
+     * 小程序绑定状态
+     *
+     * 0 未绑定 1 绑定
+     */
+    @TableField(exist = false)
+    private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
+
+    /**
+     * 新密码
+     */
+    @TableField(exist = false)
+    private String newPassword;
+
+    /**
+     * 确认新密码
+     */
+    @TableField(exist = false)
+    private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
+
+    /**
+     * personId集合
+     */
+    @TableField(exist = false)
+    private List<TaPerson> personIds;
+
+    /**
+     * customerId集合
+     */
+    @TableField(exist = false)
+    private List<TaRecommendCustomer> customerIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
+
+    private Boolean notShow;
+
+    /**
+     * 公司封面
+     */
+    @TableField(exist = false)
+    private String orgThumb;
+
+    /**
+     * 公司描述
+     */
+    @TableField(exist = false)
+    private String orgDesc;
+
+    /**
+     * 公司Logo
+     */
+    @TableField(exist = false)
+    private String orgLogo;
+
+    /**
+     * BOSS 开屏图
+     */
+    @TableField(exist = false)
+    private String bossDisplay;
+}

src/main/java/com/yunzhi/marketing/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.yunzhi.marketing.center.taUser.entity.TaTags;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
 
     TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
+
+    IPage<TaUserVO> selectPageList(IPage<TaUserVO> page, @Param("idLists") List<Integer> idLists);
 }

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

@@ -23,6 +23,8 @@ import com.yunzhi.marketing.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelVisitNum;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelVisitPersonNum;
 import com.yunzhi.marketing.excel.ActivityStatistics.TsChannelDaily;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -68,6 +70,9 @@ public class TaChannelController extends BaseController {
     @Autowired
     private TaChannelPersonService taChannelPersonService;
 
+    @Autowired
+    private IInstitutionService iInstitutionService;
+
 
     /**
      * 渠道管理列表
@@ -88,11 +93,13 @@ 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);
-            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId);
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,institution.getInstitutionCode());
+            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, institution.getInstitutionCode());
 
             result.getRecords().stream().forEach(e -> {
                 for(TaChannel channel : recommendCount){

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
@@ -531,7 +532,7 @@ public class TaPersonController extends BaseController {
         if (null == pageNumber) pageNumber = 1;
         if (null == pageSize) pageSize = 10;
 
-        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        IPage<TaUserVO> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
         return ResponseBean.success(taPersonIPage);
     }
 
@@ -544,7 +545,7 @@ public class TaPersonController extends BaseController {
         if (null == pageNumber) pageNumber = 1;
         if (null == pageSize) pageSize = 10;
 
-        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        IPage<TaUserVO> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
         return ResponseBean.success(taPersonIPage);
     }
 

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

@@ -85,6 +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));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             List<TaPolicy> records = result.getRecords();

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
@@ -547,7 +548,7 @@ public class TaRecommendCustomerController extends BaseController {
      * 分配置业顾问
      */
     @RequestMapping(value = "/admin/customer/consultant/assist/{personId}", method = RequestMethod.POST)
-    public ResponseBean assistConsultant(@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request) {
+    public ResponseBean assistConsultant(@RequestBody TaUserVO taUser, @PathVariable String personId, HttpServletRequest request) {
         try {
             Integer orgId = getOrgId(request);
             return taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
@@ -561,7 +562,7 @@ public class TaRecommendCustomerController extends BaseController {
      * 批量分配置业顾问
      */
     @RequestMapping(value = "/admin/customer/consultant/batchAssist", method = RequestMethod.POST)
-    public ResponseBean batchAssistConsultant(@RequestBody TaUser taUser, HttpServletRequest request) {
+    public ResponseBean batchAssistConsultant(@RequestBody TaUserVO taUser, HttpServletRequest request) {
         if (CollectionUtils.isEmpty(taUser.getCustomerIds())) {
             return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
         }

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

@@ -12,6 +12,7 @@ import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.service.ITaBuildingProjectTypeService;
 import com.yunzhi.marketing.service.ITdBuildingTypeService;
 import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.xlk.entity.Institution;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -79,10 +80,12 @@ 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){
+            e.printStackTrace();
             logger.error("tdBuildingTypeList -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }

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);
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionCode") String institutionCode);
 
-    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionCode") String institutionCode);
 
     /**
      * 渠道引进客户统计

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -45,7 +46,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone, Integer status, String buildingId, String personTags);
 
-    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId);
+    IPage<TaUserVO> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId);
 
     TaPerson newPersonByOpenid(String openid, Integer orgId);
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.dto.AverageReportDTO;
 import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
@@ -61,9 +62,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
-    ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId);
+    ResponseBean consultantAssist(TaUserVO taUser, String customerId, Integer orgId);
 
-    ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
+    ResponseBean batchConsultantAssist(TaUserVO taUser, Integer orgId);
 
     /**
      * 导出数据(推荐客户)

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
@@ -527,26 +528,21 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId){
-        IPage<TaUser> page = new Page<>(pageNumber,pageSize);
+    public IPage<TaUserVO> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId){
+        IPage<TaUserVO> page = new Page<>(pageNumber,pageSize);
         QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
         personBuildingQueryWrapper.eq("building_id",buildingId);
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
         List<Integer>idLists = new ArrayList<>();
-//        for(int i=0; i<list.size();i++){
-//            if(null != list.get(i).getUserId()){
-//                idLists.add(list.get(i).getUserId());
-//            }
-//        }
 
         idLists = list.stream().filter(e -> null != e.getUserId()).map(e -> e.getUserId()).collect(Collectors.toList());
-        IPage<TaUser> data = new Page<>();
+        IPage<TaUserVO> data = new Page<>();
         if(CollectionUtils.isNotEmpty(idLists)) {
             QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
             userQueryWrapper.in("user_id",idLists);
             userQueryWrapper.eq("is_consultant", true);
             userQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            data = taUserService.page(page,userQueryWrapper);
+            data = taUserMapper.selectPageList(page,idLists);
         }
 
         return data;

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
@@ -1411,7 +1412,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
+    public ResponseBean batchConsultantAssist(TaUserVO taUser, Integer orgId) {
         Integer failNum = 0;
         if (CollectionUtils.isNotEmpty(taUser.getCustomerIds())) {
             for (TaRecommendCustomer taRecommendCustomer : taUser.getCustomerIds()) {
@@ -1428,27 +1429,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId) {
+    public ResponseBean consultantAssist(TaUserVO taUser, String customerId, Integer orgId) {
         logger.info("公客分配置业顾问 接收参数，taUser={}，customerId={}，orgId={}",
                 JSONObject.toJSONString(taUser), customerId, orgId);
 
         ResponseBean responseBean = new ResponseBean();
 
-        // 1.校验置业顾问
-        QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("user_id", taUser.getUserId());
-        TaUser userInfo = taUserMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper();
-        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        taPersonBuildingQueryWrapper.eq("person_id", taUser.getUserId());
         taPersonBuildingQueryWrapper.eq(!StringUtils.isEmpty(taUser.getBuildingId()), "building_id", taUser.getBuildingId());
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
 
-        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus()) {
-            responseBean.addError("置业顾问不存在或已被注销");
-            return responseBean;
-        }
-
         // 2.根据customerId获取personId
         QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
         customerQueryWrapper.eq("customer_id", customerId);
@@ -1464,7 +1456,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 3.判断是否有buildingId,有则直接更新数据
         if (!StringUtils.isEmpty(customerInfo.getBuildingId())) {
             logger.info("公客分配置业顾问 customer={}", JSONObject.toJSONString(customerInfo));
-            customerInfo.setRealtyConsultant(userInfo.getUserId().toString());
+            customerInfo.setRealtyConsultant(taUser.getUserId());
             responseBean.addSuccess(taRecommendCustomerMapper.updateById(customerInfo));
             return responseBean;
         }
@@ -1498,7 +1490,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(taPerson.getPhone());
         taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
-        taRecommendCustomer.setRealtyConsultant(userInfo.getUserId().toString());
+        taRecommendCustomer.setRealtyConsultant(taUser.getUserId());
         taRecommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
         TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
         taRecommendCustomer.setIntention(building.getBuildingName());

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

@@ -74,6 +74,9 @@ 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);

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

@@ -86,6 +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.orderByDesc(Curriculum::getWeight);
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
 

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

@@ -62,6 +62,9 @@ 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);

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

@@ -77,6 +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.orderByDesc(Video::getWeight);
             queryWrapper.orderByDesc(Video::getCreatedTime);
 

src/main/resources/mapper/TaChannelMapper.xml

@@ -22,6 +22,7 @@
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
         LEFT JOIN ta_person tp ON cp.person_id = tp.person_id	AND cp.STATUS = 1
+        LEFT JOIN xlk_institution i ON c.institution_id = i.institution_id
         LEFT JOIN (
         SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_channel_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id) ts on c.channel_id = ts.channel_id
         <where>
@@ -30,6 +31,7 @@
             </if>
             and c.org_id = #{orgId}
             and c.status = 1
+            AND i.institution_code like CONCAT(#{institutionCode}, '%')
         </where>
         GROUP BY c.channel_id
     </select>
@@ -41,13 +43,15 @@
         FROM
         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 = 'estate agent'
+        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}, '%')
         </where>
         GROUP BY c.channel_id
     </select>

src/main/resources/mapper/TaUserMapper.xml

@@ -158,4 +158,22 @@
         Limit 1
     </select>
 
+    <select id="selectPageList" resultType="com.yunzhi.marketing.center.taUser.entity.TaUserVO">
+        SELECT
+            s.person_id as user_id,
+            t.*
+        FROM
+            ta_user t
+        INNER JOIN ta_person s ON s.user_id = t.user_id
+        where
+        t.is_consultant = 1
+        and t.status = 1
+        <if test="idLists != null and idLists.size() > 0 ">
+            and t.user_id in
+            <foreach collection="idLists" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>