浏览代码

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

傅行帆 5 年前
父节点
当前提交
ffa7fcd882

+ 3
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java 查看文件

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

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java 查看文件

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

+ 3
- 2
src/main/resources/mapper/TaPersonVisitRecordMapper.xml 查看文件

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