合并

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

@@ -1,8 +1,28 @@
 package com.huiju.estateagents.base;
 
+import com.huiju.estateagents.common.JWTUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @author FXF
  * @date 2018-12-18
  */
 public class BaseController {
+	
+	/**
+	 * 获取orgId
+	 * @param request
+	 * @return
+	 */
+	public Integer getOrgId(HttpServletRequest request){
+		
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("orgId")){
+			return Integer.valueOf(map.get("orgId").toString());
+		}
+		
+		return null;
+	}
 }

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -13,6 +13,7 @@ import com.huiju.estateagents.center.sysUser.service.ISysUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,6 +155,21 @@ public class SysUserController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/current",method=RequestMethod.GET)
+    public ResponseBean currentUser(HttpServletRequest request){
+        String userName = JWTUtils.getSubject(request);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        sysUser.setPassword(null);
+
+        return ResponseBean.success(sysUser);
+    }
     
     @PostMapping("/center/signin")
     public ResponseBean signin(@RequestBody String paramStr) {

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

@@ -78,11 +78,7 @@ public class TaUserController extends BaseController {
     public ResponseBean taUserAdd(@RequestBody TaUser taUser){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaUserService.save(taUser)){
-                responseBean.addSuccess(taUser);
-            }else {
-                responseBean.addError("fail");
-            }
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserAdd -=- {}",e.toString());
@@ -119,16 +115,12 @@ public class TaUserController extends BaseController {
      * @param taUser 实体对象
      * @return
      */
-    @RequestMapping(value="/taUser/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.PUT)
     public ResponseBean taUserUpdate(@PathVariable Integer id,
                                         @RequestBody TaUser taUser){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaUserService.updateById(taUser)){
-                responseBean.addSuccess(taUser);
-            }else {
-                responseBean.addError("fail");
-            }
+            iTaUserService.updateInfoWithOrg(taUser);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserUpdate -=- {}",e.toString());
@@ -136,12 +128,30 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.getInfoWithOrg(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+
+        return responseBean;
+    }
 
     /**
      * 获取当前用户信息
+     * @param request
+     * @return
      */
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
-    public ResponseBean taUserGet(HttpServletRequest request){
+    public ResponseBean taUserGetCurrent(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Map map = JWTUtils.getUserIdAndOrgId(request);
         try {

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.center.taUser.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -79,4 +80,16 @@ public class TaUser implements Serializable {
      * 是否管理员
      */
     private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
 }

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

@@ -17,4 +17,10 @@ import java.util.Map;
 public interface ITaUserService extends IService<TaUser> {
 	
 	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+
+    TaUser newUserAndOrg(TaUser taUser) throws Exception;
+
+    TaUser getInfoWithOrg(Integer id);
+
+    void updateInfoWithOrg(TaUser taUser) throws Exception;
 }

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

@@ -1,13 +1,19 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.mapper.TaOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +30,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Autowired
 	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaOrgMapper taOrgMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -31,4 +40,78 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		pg.setRecords(taUserList);
 		return pg;
 	}
+
+	@Override
+	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+
+		if (StringUtils.isEmpty(taUser.getLoginName())) {
+			taUser.setLoginName(taUser.getPhone());
+		}
+
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+
+		// 先插入 org
+		TaOrg taOrg = new TaOrg();
+		taOrg.setName(taUser.getOrgName());
+		taOrg.setWaterMark(taUser.getWaterMark());
+		taOrg.setCreateDate(LocalDateTime.now());
+		if (taOrgMapper.insert(taOrg) < 1) {
+			throw new Exception("生成用户公司信息失败");
+		}
+
+		taUser.setOrgId(taOrg.getOrgId());
+		taUser.setIsAdmin(true);
+		taUser.setStatus(CommConstant.STATUS_NORMAL);
+		taUser.setCreateDate(LocalDateTime.now());
+		if (!this.save(taUser)) {
+			throw new Exception("生成用户信息失败");
+		}
+
+		return taUser;
+	}
+
+	@Override
+	public TaUser getInfoWithOrg(Integer id) {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			return taUser;
+		}
+
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taUser.setOrgName(taOrg.getName());
+			taUser.setWaterMark(taOrg.getWaterMark());
+		}
+
+		taUser.setLoginPassword(null);
+		return taUser;
+	}
+
+	@Override
+	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taOrg.setName(taUser.getOrgName());
+			taOrg.setWaterMark(taUser.getWaterMark());
+
+			if (taOrgMapper.updateById(taOrg) < 1) {
+				throw new Exception("更新用户公司信息失败");
+			}
+		}
+
+		if (taUserMapper.updateById(taUser) < 1) {
+			throw new Exception("更新用户信息失败");
+		}
+	}
 }

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

@@ -24,7 +24,7 @@ public class CommConstant {
     public final static String PERSON_ESTATE_CUSTOMER = "customer";
 
     /**
-     * 人员类型: 客户
+     * 人员类型: 渠道经纪人
      */
     public final static String PERSON_ESTATE_CHANNEL = "channel agent";
 
@@ -182,22 +182,22 @@ public class CommConstant {
     /**
      * 客户报备
      */
-    public static final String CUSTOMER_REPORT = "1";
+    public static final Integer CUSTOMER_REPORT = 1;
 
     /**
      * 客户到访
      */
-    public static final String CUSTOMER_VISITE = "2";
+    public static final Integer CUSTOMER_VISITE = 2;
 
     /**
      * 客户认购
      */
-    public static final String CUSTOMER_PREORDER = "3";
+    public static final Integer CUSTOMER_PREORDER = 3 ;
 
     /**
      * 客户签约
      */
-    public static final String CUSTOMER_SIGNED = "4";
+    public static final Integer CUSTOMER_SIGNED = 4;
 
 
     /**
@@ -363,4 +363,9 @@ public class CommConstant {
     public static final Integer NOT_PUBLISH = 0;
     // ------- 政策发布状态 end -------
 
+    // 公客
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
+    // 私客
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
+
 }

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

@@ -4,6 +4,7 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,6 +34,32 @@ public class CommonController {
         }
     }
 
+    /**
+     * 为适应 ANTD 特制的图片上传
+     * plat 中心端传 center 管理端传 admin
+     * @param multipartFile
+     * @return
+     */
+    @PostMapping("/{plat}/antd/image")
+    public Map<String, String> uploadImageForAntd(@RequestParam("file") MultipartFile multipartFile) {
+        Map<String, String> result = new HashMap<>();
+
+        try {
+            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+
+            result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
+            result.put("status", "done");
+            result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");
+            result.put("url", img);
+
+        } catch (IOException e) {
+            result.put("status", "error");
+            result.put("message", e.getMessage());
+        }
+
+        return result;
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -71,13 +71,13 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender) {
+    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender,HttpServletRequest request) {
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         try {
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
-
+            Integer orgId =getOrgId(request);
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
@@ -86,13 +86,14 @@ public class MiniAppController {
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
+            personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
             if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid());
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(),orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -221,14 +222,13 @@ public class MiniAppController {
 
         // 更新用户绑定手机
         String openid = JWTUtils.getSubject(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber());
+        Integer orgId = getOrgId(request);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-        taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
@@ -262,23 +262,6 @@ public class MiniAppController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
-        } else{
-            TaRecommendCustomer reCustomer = new TaRecommendCustomer();
-            reCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            reCustomer.setName(person.getNickname());
-            reCustomer.setPhone(phoneNoInfo.getPhoneNumber());
-            reCustomer.setSex(Integer.valueOf(person.getGender()));
-            reCustomer.setPersonId(person.getPersonId());
-            reCustomer.setPicture(person.getAvatarurl());
-            reCustomer.setCountry(person.getCountry());
-            reCustomer.setCity(person.getCity());
-            reCustomer.setProvince(person.getProvince());
-            reCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-            reCustomer.setCreateDate(LocalDateTime.now());
-            reCustomer.setReportRecommendStatus(CommConstant.READY);
-            if(!taRecommendCustomerService.save(reCustomer)){
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
         }
         return ResponseBean.success(phoneNoInfo);
     }
@@ -312,4 +295,15 @@ public class MiniAppController {
             return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+
+
+    public Integer getOrgId(HttpServletRequest request){
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")){
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
 }

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

@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -76,8 +77,8 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String buildingId,
                                              @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
-                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
         return responseBean;
     }
 
@@ -197,9 +198,10 @@ public class TaBuildingDynamicController extends BaseController {
 
 
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
         dynamic.setStatus(1);
@@ -211,9 +213,10 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
@@ -223,10 +226,11 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
         dynamic.setWeight(weight);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){

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

@@ -70,6 +70,7 @@ public class TaPersonController extends BaseController {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        Integer orgId = getOrgId(request);
         if (mine){
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -80,7 +81,7 @@ public class TaPersonController extends BaseController {
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId);
             return ResponseBean.success(result);
         }
 
@@ -88,7 +89,8 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerConsultant")
-    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerConsultant(HttpServletRequest request) {
+        Integer orgId =getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -114,8 +116,9 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerAgent")
-    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {

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

@@ -95,7 +95,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/new")
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
     }
 
     /**
@@ -107,7 +108,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/report")
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
     }
 
     @PostMapping("/wx/customer/recommend")
@@ -147,7 +149,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    // 客户列表
+    // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
@@ -158,9 +160,10 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @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));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -211,14 +214,21 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
 
-    //独立经纪人列表
+    /**
+     * 经纪人列表
+     * @param name
+     * @param tel
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
     @GetMapping("/admin/customer/agents")
     public ResponseBean getIndependentAgents (@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));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, null));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -55,5 +55,5 @@ public class TaOrg implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    private String waterMark;
 }

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

@@ -228,7 +228,7 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
-    private String orgId;
+    private Integer orgId;
 
     private Integer userId;
 
@@ -246,4 +246,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private TaOrg org;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
 }

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

@@ -105,7 +105,7 @@ public class TaRecommendCustomer implements Serializable {
      * 状态
      */
     @TableField(value = "`status`")
-    private String status;
+    private Integer status;
 
     /**
      * 推荐人
@@ -147,6 +147,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private Integer reportRecommendStatus;
 
+    private Integer orgId;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

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

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title,@Param("orgId") Integer orgId);
 
     /**
      * 详情

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

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId);
+    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId,@Param("orgId")Integer orgId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 

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

@@ -29,5 +29,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     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<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+
+    /**
+     * 公客
+     * @param page
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @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);
 }

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

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId);
 
     /**
      * 项目详情

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

@@ -22,9 +22,9 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone);
+    TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 
@@ -42,7 +42,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);
 
-    TaPerson newPersonByOpenid(String openid);
+    TaPerson newPersonByOpenid(String openid,Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 

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

@@ -22,19 +22,19 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean updateCustByJSON(String paramStr);
 
-    ResponseBean recommendCust(String paramStr, String openid);
+    ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid);
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
 
     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);
+    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> getRecCustomerList(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);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId);

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

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

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

@@ -123,7 +123,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson updatePersonPhone(String miniOpenid, String phone) {
+    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
         // 先查询是否存在用户
         TaPerson person = null;
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
@@ -145,9 +145,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
-        wrapper.set("person_type",CommConstant.PERSON_ESTATE_AGENT);
+        wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
         wrapper.eq("mini_openid", miniOpenid);
-        wrapper.isNull("person_type");
+        wrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         taPersonMapper.update(new TaPerson(), wrapper);
 
         person.setPhone(phone);
@@ -155,7 +155,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setTel(phone);
         }
 
-        iTaRecommendCustomerService.newByPerson(person);
+       // iTaRecommendCustomerService.newByPerson(person);
         
         // 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
@@ -164,13 +164,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId) {
         Page<Map<String, Object>> page = new Page<>();
         page.setSize(pageSize);
         page.setPages(pageNumber);
         page.setCurrent(pageNumber);
 
-        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId);
         page.setRecords(result);
 
         return page;
@@ -398,13 +398,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson newPersonByOpenid(String openid) {
+    public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             TaPerson taPerson = new TaPerson();
             taPerson.setMiniOpenid(openid);
             taPerson.setNickname("匿名用户");
+            taPerson.setOrgId(orgId);
             taPerson.setAvatarurl(CommConstant.MINIAPP_DEFAULT_AVATAR);
+            taPerson.setPersonType(CommConstant.PERSON_ESTATE_DRIFT);
             taPerson.setStatus(CommConstant.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             if (taPersonMapper.insert(taPerson) > 0) {

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

@@ -140,7 +140,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean recommendCust(String paramStr, String openid) {
+    public ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -159,6 +159,7 @@ 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"));
@@ -186,8 +187,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
         String status = params.getString("status");
-        if (null == status) status = "1";
-        taRecommendCustomer.setStatus(status);
+        int statusInt = 0;
+        if (null == status) statusInt = Integer.parseInt(status);
+        taRecommendCustomer.setStatus(statusInt);
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
         // 报备有 10 天有效期
@@ -218,7 +220,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public ResponseBean reportCust(String paramStr, String openid) {
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -235,7 +237,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-
+        taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
         taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(params.getString("phone"));
@@ -243,7 +245,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
-        taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
 
@@ -260,8 +262,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDemandType(params.getString("demandType"));
 //        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-        taRecommendCustomer.setStatus(CommConstant.STATUS_NORMAL + "");
+        taRecommendCustomer.setVerifyStatus(CommConstant.READY);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
 
 
 //        String status = params.getString("status");
@@ -330,15 +332,25 @@ 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){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+    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){
+
+        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);
+        } else {
+            // 私客
+            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex);
+        }
+
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel){
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
         IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel);
+        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
     }
 
     @Override

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -33,6 +33,9 @@
         <if test="title != null and title != ''">
             and title = #{title}
         </if>
+        <if test="orgId != null and orgId != ''">
+            and org_id = #{orgId}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>

src/main/resources/mapper/TaPersonMapper.xml

@@ -17,6 +17,7 @@
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and p.building_id = #{buildingId}
         </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -73,23 +73,29 @@ FROM
 
     <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-	a.*
-FROM
-	ta_person a
-<where>
-    a.person_type = 'estate agent'
-    and a.status >0
-    <if test="name != null and name !=''">
-        and a.nickname = #{name}
-    </if>
-    <if test="tel != null and tel!=''">
-        and a.phone = #{tel}
-    </if>
+            a.*,
+            tc.channel_name as channelName
+        FROM
+            ta_person a
+            left join ta_channel_person tcp on a.person_id = tcp.person_id
+            left join ta_channel tc on tc.channel_id = tcp.channel_id
+        <where>
+            a.person_type = 'estate agent'
+            and a.status >0
+            <if test="name != null and name !=''">
+                and a.nickname = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone = #{tel}
+            </if>
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
 
-</where>
+        </where>
 
-ORDER BY
-	create_date DESC
+        ORDER BY
+            create_date DESC
     </select>
 
     <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -145,6 +151,7 @@ ORDER BY
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
+            and realty_consultant is not null
             <if test="building != null and building !=''">
                 and a.building_id = #{building}
             </if>
@@ -181,4 +188,29 @@ FROM
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
 	WHERE a.customer_id = #{customerId}
     </select>
+
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+        b.*
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone = #{tel}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+    </select>
 </mapper>