合并

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

@@ -84,9 +84,29 @@ public class TaUser implements Serializable {
     /**
      * 公司名称
      */
-    @TableField(exist = false)
     private String orgName;
 
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+
+
     /**
      * 公司水印
      */

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

@@ -22,6 +22,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;
 
 /**
@@ -60,7 +61,7 @@ public class ExtendContentController extends BaseController {
                                           @RequestParam(value = "contentType", required = false) String contentType,
                                           @RequestParam(value = "showPosition", required = false) String showPosition,
                                           @RequestParam(value = "status", required = false) Integer status,
-                                          @RequestParam(value = "showType", required = false) String showType){
+                                          @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
@@ -69,6 +70,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.eq(StringUtils.isNotBlank(contentType), "content_type", contentType);
             queryWrapper.eq(StringUtils.isNotBlank(showPosition), "show_position", showPosition);
             queryWrapper.eq(null!=status, "status", status);
+            queryWrapper.eq( "org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -97,10 +99,11 @@ public class ExtendContentController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
-    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
         extendContent.setCityId(cityId);
         extendContent.setCreateDate(LocalDateTime.now());
+        extendContent.setOrgId(getOrgId(request));
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
           return responseBean;
@@ -136,12 +139,13 @@ public class ExtendContentController extends BaseController {
      */
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
-                                        @RequestBody ExtendContent extendContent){
+                                        @RequestBody ExtendContent extendContent,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         extendContent.setContentId(id);
         try {
             Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
             extendContent.setCityId(cityId);
+            extendContent.setOrgId(getOrgId(request));
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
             }else {

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

@@ -142,10 +142,19 @@ public class TaPersonController extends BaseController {
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             TaChannel channel = taChannelService.getOne(queryWrapper);
+            QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
+            taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
+            taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
+            taChannelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            int count = taChannelPersonService.count(taChannelPersonQueryWrapper);
+            if(count>0){
+                return ResponseBean.error("您已绑定过该渠道",ResponseBean.ERROR_UNAVAILABLE);
+            }
             TaChannelPerson channelPerson = new TaChannelPerson();
             channelPerson.setChannelId(channel.getChannelId());
             channelPerson.setPersonId(person.getPersonId());
             channelPerson.setCreateDate(LocalDateTime.now());
+            channelPerson.setStatus(CommConstant.STATUS_NORMAL);
             taChannelPersonService.save(channelPerson);
         }
         taPersonService.updateById(person);
@@ -405,6 +414,22 @@ public class TaPersonController extends BaseController {
         return taPersonService.editConsultant(id, paramStr);
     }
 
+    @PutMapping("/wx/editConsultant/{id}")
+    public ResponseBean editWxConsultant(@PathVariable String id, @RequestBody TaPerson taPerson) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            taPerson.setPersonId(id);
+            if(taPersonService.updateById(taPerson)){
+                responseBean.addSuccess(taPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+
+        }
+        return responseBean;
+    }
+
     boolean isEmpty(String str) {
         return null == str || "".equals(str.trim());
     }
@@ -436,6 +461,62 @@ public class TaPersonController extends BaseController {
 //        }
 //
 //    }
+    /**
+     * 变更经纪人类型
+     * @param channelCode 渠道码
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/beComeChannel/{channelCode}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
+                QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
+                channelQueryWrapper.eq("channel_code",channelCode);
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
+                channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+                int count = taChannelPersonService.count(channelPersonQueryWrapper);
+                if(count >0){
+                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                }
+                TaChannelPerson channelPerson = new TaChannelPerson();
+                channelPerson.setCreateDate(LocalDateTime.now());
+                channelPerson.setPersonId(person.getPersonId());
+                channelPerson.setChannelId(channel.getChannelId());
+                channelPerson.setStatus(CommConstant.STATUS_NORMAL);
+                taChannelPersonService.save(channelPerson);
+            }else {
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+                if (taChannelPerson.size()>0){
+                    for(int i=0;i<taChannelPerson.size();i++){
+                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+                    }
+                    taChannelPersonService.updateBatchById(taChannelPerson);
+                }
+            }
+            person.setPersonType(personType);
+            if (taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
 
 

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

@@ -8,11 +8,15 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +25,7 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -44,6 +49,12 @@ public class TaRecommendCustomerController extends BaseController {
     @Resource
     private ApplicationContext applicationContext;
 
+    @Autowired
+    private TaChannelService taChannelService;
+
+    @Autowired
+    private TaChannelPersonService taChannelPersonService;
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -132,9 +143,61 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/wx/customer/myReport")
-    public ResponseBean getCustomerIReport (@RequestParam(value ="personId") String personId,
+    public ResponseBean getCustomerIReport (HttpServletRequest request,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.eq("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/wx/customer/myCustomer")
+    public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    @GetMapping("/wx/customer/myInviteAgent")
+    public ResponseBean getMyInviteAgent (@RequestParam(value ="personId") String personId,
+                                       @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
@@ -149,6 +212,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+
     // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
@@ -163,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);
@@ -173,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,
@@ -184,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);
@@ -205,7 +270,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
         Integer orgid = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,orgid));
+            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);
@@ -222,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);
@@ -236,16 +302,35 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping("/admin/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
-        String buildingId="";
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+    @GetMapping("/wx/customer/recommend/{customerId}")
+    public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
+        Integer orgId =getOrgId(request);
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+
         /**
      * 修改对象
      * @param taRecommendCustomer 实体对象
@@ -291,6 +376,29 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 修改对象
+     * @param taRecommendCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    public ResponseBean taWxRecommendCustomerUpdate(@PathVariable String id,
+                                                  @RequestBody TaRecommendCustomer taRecommendCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        taRecommendCustomer.setCustomerId(id);
+        try {
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                responseBean.addSuccess(taRecommendCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
     public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
         ResponseBean responseBean = new ResponseBean();
@@ -330,11 +438,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/TaChannelPerson.java

@@ -38,5 +38,7 @@ public class TaChannelPerson implements Serializable {
      */
     private LocalDateTime createDate;
 
+    private Integer status;
+
 
 }

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

@@ -41,5 +41,10 @@ public class TaPersonBuilding implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
 
 }

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,@Param("orgid")Integer orgid);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
+    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);
 

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,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, Integer orgId);
 
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
@@ -41,7 +41,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 }

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

@@ -649,12 +649,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @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,Integer orgid){
+    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,orgid);
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
     }
 
     @Override
@@ -389,7 +387,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId){
+
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person

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>
@@ -153,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>
@@ -210,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