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

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

@@ -338,6 +338,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
 		taUser.setStatus(CommConstant.STATUS_NORMAL);
 		taUser.setCreateDate(LocalDateTime.now());
+		if (taUser.getIsConsultant() == null) {
+			taUser.setIsConsultant(false);
+		}
 		if (taUserMapper.insert(taUser) < 1) {
 			throw new Exception("生成用户信息失败");
 		}

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

@@ -135,9 +135,9 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaUser userShareInfo = taUserMapper.selectById(e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
 			if (userShareInfo != null){
-				e.setShareName(userShareInfo.getUserName());
+				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
 		});

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -132,6 +132,7 @@
         b.drainage_id
         from ta_person_visit_record t
         left join ta_drainage b on t.target_id = b.drainage_id
+        left join ta_person c on t.share_person_id = c.person_id
         where
         t.event_type = 'h5'
         and t.share_person_id is not null
@@ -145,10 +146,10 @@
             and b.name like concat('%',#{activityName},'%')
         </if>
         <if test="shareName !=null and shareName != ''">
-            and t.data like concat('%',#{shareName},'%')
+            and c.nickname like concat('%',#{shareName},'%')
         </if>
         <if test="shareTel !=null and shareTel != ''">
-            and t.data like concat('%',#{shareTel},'%')
+            and c.phone = #{shareTel}
         </if>
         group by t.person_id, t.share_person_id
         order by t.visit_time desc