|
@@ -555,7 +555,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
|
|
//手机号不为空,群组不为空
|
|
//手机号不为空,群组不为空
|
|
if (CollectionUtil.isNotEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
if (CollectionUtil.isNotEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
//群组内所有人手机号
|
|
//群组内所有人手机号
|
|
- List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId());
|
|
|
|
|
|
+ List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId(),userInfo.getMobile());
|
|
docRoleMobiles.addAll(docConversationMobiles);
|
|
docRoleMobiles.addAll(docConversationMobiles);
|
|
if (!docRoleMobiles.contains(userInfo.getMobile())) {
|
|
if (!docRoleMobiles.contains(userInfo.getMobile())) {
|
|
continue;
|
|
continue;
|
|
@@ -564,7 +564,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
|
|
//手机号为空,群组不为空
|
|
//手机号为空,群组不为空
|
|
if (CollectionUtil.isEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
if (CollectionUtil.isEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
//群组内所有人手机号
|
|
//群组内所有人手机号
|
|
- List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId());
|
|
|
|
|
|
+ List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId(),userInfo.getMobile());
|
|
if (!docConversationMobiles.contains(userInfo.getMobile())) {
|
|
if (!docConversationMobiles.contains(userInfo.getMobile())) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -597,7 +597,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
|
|
//手机号不为空,群组不为空
|
|
//手机号不为空,群组不为空
|
|
if (CollectionUtil.isNotEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
if (CollectionUtil.isNotEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
//群组内所有人手机号
|
|
//群组内所有人手机号
|
|
- List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId());
|
|
|
|
|
|
+ List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId(),userInfo.getMobile());
|
|
docRoleMobiles.addAll(docConversationMobiles);
|
|
docRoleMobiles.addAll(docConversationMobiles);
|
|
if (!docRoleMobiles.contains(userInfo.getMobile())) {
|
|
if (!docRoleMobiles.contains(userInfo.getMobile())) {
|
|
return true;
|
|
return true;
|
|
@@ -606,7 +606,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
|
|
//手机号为空,群组不为空
|
|
//手机号为空,群组不为空
|
|
if (CollectionUtil.isEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
if (CollectionUtil.isEmpty(docRoleMobiles) && CollectionUtil.isNotEmpty(docConversationRels)) {
|
|
//群组内所有人手机号
|
|
//群组内所有人手机号
|
|
- List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId());
|
|
|
|
|
|
+ List<String> docConversationMobiles = docConversationRelService.getListByDocId(doc.getId(),userInfo.getMobile());
|
|
if (!docConversationMobiles.contains(userInfo.getMobile())) {
|
|
if (!docConversationMobiles.contains(userInfo.getMobile())) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|