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

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -311,7 +311,9 @@ public class TaH5SampleController extends BaseController {
             queryWrapper.eq("sample_id", taH5Sample.getSampleId());
             List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
             if (sampleContactList.size() > 0) {
-                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>()
+                        .in("contact_ id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList()))
+                        .eq("status",CommConstant.STATUS_NORMAL));
                 taH5Sample.setTaContactList(taContactList);
             }
             if (!StringUtils.isEmpty(taH5Sample.getTag())) {

src/main/java/com/huiju/estateagents/sample/service/impl/TaContactServiceImpl.java

@@ -53,7 +53,7 @@ public class TaContactServiceImpl extends ServiceImpl<TaContactMapper, TaContact
         }
 
         // 更新样例表状态
-        taH5SampleMapper.batchUpdateStatus(updateList, userId);
+//        taH5SampleMapper.batchUpdateStatus(updateList, userId);
 
         responseBean.addSuccess(updateBatchById(updateList));
         return responseBean;