Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
@@ -469,10 +470,17 @@ public class TaBuildingController extends BaseController {
 
         boolean state = taPersonBuildingService.removeById(id);
         if (state) {
-            TaPerson taPerson = iTaPersonService.getById(taPersonBuilding.getPersonId());
-            // 成为驻场顾问并绑定楼盘
-            taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-            iTaPersonService.updateById(taPerson);
+            // 查询下是否还有其他的楼盘驻场
+            LambdaQueryWrapper<TaPersonBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,taPersonBuilding.getPersonId());
+            List<TaPersonBuilding> list = taPersonBuildingService.list(lambdaQueryWrapper);
+            if (list.size() < 1) {
+                TaPerson taPerson = iTaPersonService.getById(taPersonBuilding.getPersonId());
+                // 成为驻场顾问并绑定楼盘
+                taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+                iTaPersonService.updateById(taPerson);
+            }
+
             responseBean.addSuccess("解绑成功");
         }else {
             responseBean.addError("请检查是否存在驻场人员");

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

@@ -601,6 +601,7 @@ public class TaPersonController extends BaseController {
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);
+                user.setPhoto(avatar);
                 user.setLoginName(phone);
                 user.setDescription(description);
                 taUserService.updateById(user);

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

@@ -325,6 +325,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("description", user.getDescription());
         result.put("department", user.getDepartment());
         result.put("picture", user.getPhoto());
+        result.put("photo", user.getPhoto());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());