魏超 5 年之前
父節點
當前提交
c9c71c36e5

+ 14
- 12
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java 查看文件

234
         }
234
         }
235
 
235
 
236
         //更新业务层的登录账号为禁用
236
         //更新业务层的登录账号为禁用
237
-        QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
238
-        taChannelAppRelationQueryWrapper.eq("channel_id", id);
239
-        List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
240
-        List<Integer> orgIdList = new ArrayList<>();
241
-        taChannelAppRelation.forEach(e->{
242
-            orgIdList.add(e.getOrgId());
243
-        });
244
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
245
-        taUserQueryWrapper.in("org_id", orgIdList);
246
-        TaUser taUser = new TaUser();
247
-        taUser.setStatus(taChannelProxy.getStatus());
248
-        iTaUserService.update(taUser, taUserQueryWrapper);
237
+        if (taChannelProxy.getStatus() != null){
238
+            QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
239
+            taChannelAppRelationQueryWrapper.eq("channel_id", id);
240
+            List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
241
+            List<Integer> orgIdList = new ArrayList<>();
242
+            taChannelAppRelation.forEach(e->{
243
+                orgIdList.add(e.getOrgId());
244
+            });
245
+            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
246
+            taUserQueryWrapper.in("org_id", orgIdList);
247
+            TaUser taUser = new TaUser();
248
+            taUser.setStatus(taChannelProxy.getStatus());
249
+            iTaUserService.update(taUser, taUserQueryWrapper);
250
+        }
249
 
251
 
250
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
252
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
251
         taChannelProxyQueryWrapper.eq("channel_id", id);
253
         taChannelProxyQueryWrapper.eq("channel_id", id);

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

223
 		taPersonQueryWrapper.eq("org_id",orgId);
223
 		taPersonQueryWrapper.eq("org_id",orgId);
224
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
224
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
225
 		//获取我的访问客户列表
225
 		//获取我的访问客户列表
226
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
226
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
227
 		List<TaPersonVisitRecord> records = result.getRecords();
227
 		List<TaPersonVisitRecord> records = result.getRecords();
228
 		//判断是否我的客户状态
228
 		//判断是否我的客户状态
229
 		records.forEach(e -> {
229
 		records.forEach(e -> {

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

128
 	        p.`nickname` as nickname,
128
 	        p.`nickname` as nickname,
129
 	        p.avatarurl
129
 	        p.avatarurl
130
         FROM
130
         FROM
131
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} and event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
131
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND share_person = #{userId} and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
132
             left JOIN ta_person p on t.person_id = p.person_id
132
             left JOIN ta_person p on t.person_id = p.person_id
133
         GROUP BY
133
         GROUP BY
134
             t.person_id
134
             t.person_id
135
         ORDER BY
135
         ORDER BY
136
-	        t.visit_time DESC
136
+	        t.create_date DESC
137
     </select>
137
     </select>
138
 
138
 
139
 
139