魏超 преди 5 години
родител
ревизия
b8ae824458

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java Целия файл

135
 				e.setUserTel(personInfo.getPhone());
135
 				e.setUserTel(personInfo.getPhone());
136
 			}
136
 			}
137
 
137
 
138
-			TaUser userShareInfo = taUserMapper.selectById(e.getSharePersonId());
138
+			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
139
 			if (userShareInfo != null){
139
 			if (userShareInfo != null){
140
-				e.setShareName(userShareInfo.getUserName());
140
+				e.setShareName(userShareInfo.getNickname());
141
 				e.setShareTel(userShareInfo.getPhone());
141
 				e.setShareTel(userShareInfo.getPhone());
142
 			}
142
 			}
143
 		});
143
 		});

+ 3
- 2
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Целия файл

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