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

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

@@ -463,6 +463,13 @@ public class TaUserController extends BaseController {
             if (taPersonBuildingList.size() > 0){
                 if (taUser.getIsConsultant()){
                     taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                    QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                    taPersonQueryWrapper.eq("user_id",id);
+                    taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                    TaPerson taPerson = iTaPersonService.getOne(taPersonQueryWrapper);
+                    if (null != taPerson){
+                        taUser.setConsultantPersonId(taPerson.getPersonId());
+                    }
                 }else {
                     List<String> buildings = new ArrayList<>();
                     taPersonBuildingList.forEach(e -> {

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

@@ -366,6 +366,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
                 TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
                 if (null != taPerson){
                     taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+                    taPerson.setUserId(null);
                     taPersonMapper.updateById(taPerson);
                 }
             }

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

@@ -1,9 +1,6 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,6 +9,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 人员表
@@ -250,6 +251,7 @@ public class TaPerson implements Serializable {
 
     private Integer orgId;
 
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer userId;
 
     private String userPort;