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

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

@@ -67,19 +67,19 @@ public class TaChannelController extends BaseController {
                                     @RequestParam(value ="channelId",required = false) Integer channelId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String orgid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(null != channelId, "channel_id", channelId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
-
             IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
           HashMap hashMap  = new HashMap<>();
             hashMap.put("result",result);
             // 下拉列表的数据 all
-            List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
             hashMap.put("channelNmae",taChannelList);
             responseBean.addSuccess(hashMap);
         }catch (Exception e){
@@ -96,12 +96,14 @@ public class TaChannelController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
-    public ResponseBean channelAdd(@RequestBody TaChannel channel){
+    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             // 生成6位数的渠道码
             int channelCode= taChannelMapper.channelCode();
             channel.setChannelCode(String.valueOf(channelCode));
+            channel.setOrgId(orgId);
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {
@@ -186,8 +188,23 @@ public class TaChannelController extends BaseController {
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
                                            @RequestParam(value="phone",required = false) String phone,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        Integer orgid = getOrgId(request);
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid);
+        return taPerson;
+    }
+
+    /**
+     * 渠道邀请经纪人
+     */
+    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
+    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
         return taPerson;
     }
 }

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

@@ -66,7 +66,7 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
                                     @RequestParam(value ="priceLesser",required = false) Integer priceLesser,
                                     @RequestParam(value ="priceGreater",required = false) Integer priceGreater,
-                                    @RequestParam(value ="status",required = false) Integer status){
+                                    @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -76,6 +76,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.lt(null!=priceGreater,"point_price",priceGreater);
             queryWrapper.gt(null != priceLesser,"point_price",priceLesser);
             queryWrapper.eq(null != status,"status",status);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.orderByDesc("create_date");
 
@@ -95,13 +96,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.save(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -143,13 +144,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -169,7 +170,7 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
-    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
@@ -177,6 +178,7 @@ public class TaGoodsController extends BaseController {
             }else {
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -57,7 +58,7 @@ public class TaPointsExchangeController extends BaseController {
                                              @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
                                              @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
                                              @RequestParam(value ="status",required = false) Integer status,
-                                             @RequestParam(value ="tel",required = false) String tel){
+                                             @RequestParam(value ="tel",required = false) String tel, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -72,6 +73,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setEndVerifyDate(endVerifyDate);
             taPointsExchange.setStatus(status);
             taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 

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

@@ -227,7 +227,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType){ // public 公  private 私
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, null)); //getOrgId(request)
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -237,7 +237,8 @@ public class TaRecommendCustomerController extends BaseController {
 
     //推荐客户列表
     @GetMapping("/admin/customer/recommend/recommender")
-    public ResponseBean getRecCustomerList (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getRecCustomerList (HttpServletRequest request,
+                                         @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
                                          @RequestParam(value ="recommendName",required = false) String recommendName,
@@ -248,7 +249,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -267,10 +268,9 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
-        String personId = JWTUtils.getSubject(request);
-        TaPerson taPerson = taPersonService.getById(personId);
+        Integer orgid = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -287,12 +287,13 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/admin/customer/agents")
-    public ResponseBean getIndependentAgents (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getIndependentAgents (HttpServletRequest request,
+                                              @RequestParam(value ="name",required = false) String name,
                                             @RequestParam(value ="tel",required = false) String tel,
                                             @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, null));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -467,11 +468,12 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/admin/customer/recommend/drift")
-    public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+    public ResponseBean getDriftCustomerList (HttpServletRequest request,
+                                              @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId));
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -252,4 +252,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String channelName;
+
+    /**
+     * 邀请客户总数
+     */
+    @TableField(exist = false)
+    private int inviteCount;
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaChannel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,5 +28,5 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * 渠道页面下拉列表的所有数据
      * @return
      */
-    List<TaChannel> selectChannelList();
+    List<TaChannel> selectChannelList(@Param("orgId")Integer orgId);
 }

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

@@ -170,5 +170,13 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param phone
      * @return
      */
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone);
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid);
+
+    /**
+     * 渠道邀请经纪人
+     * @param pg
+     * @param id
+     * @return
+     */
+    IPage<TaPerson> InviteClientsList(IPage<TaChannel> pg, @Param("id") String id);
 }

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

@@ -26,9 +26,9 @@ 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);
-    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);
-    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
+    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);
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
 
     /**
@@ -41,5 +41,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
+    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
 }

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

@@ -54,7 +54,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId);
 
     String getPersonIdByCustomerId(String customerId);
 
@@ -73,5 +73,15 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @param phone
      * @return
      */
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize);
+    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid);
+
+    /**
+     * 渠道下邀请经纪人
+     * @param id
+     * @param phone
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
 }

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

@@ -28,11 +28,11 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
 
-    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
+    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
 
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
+    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
 
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 

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

@@ -612,21 +612,50 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize) {
+    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone);
+        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone,orgid);
+        List<TaPerson> taPersonList= IPage.getRecords();
+        for (TaPerson taPerson:taPersonList){
+            QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
+            taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
+            /*推荐客户总数*/
+            int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
+            taPerson.setRecommendCount(recommendCount);
+
+            // 邀请客户总数
+            QueryWrapper<TaPerson> taPersonQueryWrapper= new QueryWrapper<>();
+            taPersonQueryWrapper.eq("recommend_agent",taPerson.getPersonId());
+            int  inviteCount= taPersonMapper.selectCount(taPersonQueryWrapper);
+            taPerson.setInviteCount(inviteCount);
+        }
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",taPersonList);
+        hashMap.put("total",IPage.getTotal());
+        hashMap.put("pageNum",IPage.getCurrent());
+        hashMap.put("pageSize",IPage.getSize());
+        responseBean.addSuccess(hashMap);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> IPage = taPersonMapper.InviteClientsList(pg,id);
         responseBean.addSuccess(IPage);
         return responseBean;
     }
 
     @Override
-    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.isNull("person_type");
         if(building.equals("") && null != building){
             queryWrapper.eq("building_id",building);
         }
+        queryWrapper.eq(orgId != null, "org_id", orgId);
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }

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

@@ -159,7 +159,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
 
         taRecommendCustomer.setName(params.getString("name"));
-        taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setPicture(params.getString("picture"));
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(params.getInteger("sex"));
@@ -332,17 +331,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType){
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
 
-        IPage<TaRecommendCustomer> customerList = null;
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId);
         }
 
     }
@@ -354,16 +352,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
+    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
     }
 
 
     @Override
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
+    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
     }
 
     @Override

src/main/resources/mapper/TaChannelMapper.xml

@@ -25,5 +25,6 @@
     
     <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
         select * from ta_channel
+        where org_id = #{orgId}
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -492,6 +492,7 @@ FROM
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
+        p.person_id,
         p.avatarurl,
         p.tel,
         p.sex,
@@ -508,8 +509,12 @@ FROM
             and rc.phone = #{phone}
         </if>
             and p.person_type = 'estate agent'
+            and p.org_id= #{orgid}
         </where>
         GROUP BY p.person_id
     </select>
 
+    <select id="InviteClientsList" resultType="com.huiju.estateagents.entity.TaPerson">
+        select * from ta_person WHERE recommend_agent = #{id}
+    </select>
 </mapper>

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -28,6 +28,9 @@
         <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
             and  t.`status` = #{taPointsExchange.status}
         </if>
+        <if test="taPointsExchange.orgId != null and taPointsExchange.orgId != ''">
+            and  t.org_id = #{taPointsExchange.orgId}
+        </if>
         <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
             and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
         </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -43,6 +43,9 @@ FROM
 	<where>
         a.status > 0
         and a.report_recommend_status = 2
+        <if test="orgId != null">
+            and a.org_id = #{orgId}
+        </if>
         <if test="building != null and building !=''">
             and a.building_id = #{building}
         </if>
@@ -110,6 +113,9 @@ FROM
         <where>
             a.status > 0
             and a.report_recommend_status = 1
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
             <if test="building != null and building !=''">
                 and a.building_id = #{building}
             </if>
@@ -133,6 +139,7 @@ FROM
             </if>
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
+                and a.org_id = #{orgid}
             </if>
         </where>
         order by a.create_date desc
@@ -152,6 +159,9 @@ FROM
         <where>
             a.status > 0
             and realty_consultant is not null
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
             <if test="building != null and building !=''">
                 and a.building_id = #{building}
             </if>
@@ -209,6 +219,9 @@ FROM
             <if test="sex != null and sex !=''">
                 and b.sex = #{sex}
             </if>
+            <if test="orgId != null">
+                and b.org_id = #{orgId}
+            </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
         </where>
         order by b.create_date desc