Merge remote-tracking branch 'origin/dev' into dev

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

@@ -84,17 +84,18 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+
         if (mine){
-            String openid = getOpenId(request);
-            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-            if (null == taPersons || taPersons.size() != 1) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            TaPerson person = taPersons.get(0);
             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,orgId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId, person);
             return ResponseBean.success(result);
         }
 

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

@@ -25,7 +25,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, @Param("orgId") Integer orgId);
+    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, @Param("consultant") String consultant);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 

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

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -26,7 +25,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 

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

@@ -202,13 +202,26 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person) {
+        // 获取当前人员的推荐置业顾问ID
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("person_id", person.getPersonId());
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.last("limit 1");
+        TaRecommendCustomer cust = taRecommendCustomerMapper.selectOne(queryWrapper);
+        String consultant = "";
+        if (cust != null) {
+            // 有可能是 personId, 有可能是 userId
+            consultant = cust.getRealtyConsultant();
+        }
+
         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,orgId);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId, consultant);
         page.setRecords(result);
 
         return page;

src/main/resources/mapper/TaPersonMapper.xml

@@ -12,7 +12,8 @@
             t.tel AS phone,
             t.avatarurl AS avatar,
             t.photo,
-            u.description as description
+            u.description as description,
+            (t.person_id = #{consultant} or t.user_id = #{consultant}) as mine
         FROM
             ta_person t left join ta_user u on t.user_id = u.user_id
         LEFT JOIN ta_person_building p ON u.user_id = p.user_id