leo.xie 3 éve
szülő
commit
29580c6d17

+ 1 - 1
src/main/java/com/ads/business/dao/DocConversationRelDao.java

@@ -16,5 +16,5 @@ import java.util.List;
  */
 public interface DocConversationRelDao extends BaseMapper<DocConversationRel> {
 
-    List<String> getListByDocId(@Param("id") Long id);
+    List<String> getListByDocId(@Param("id") Long id,@Param("mobile") String mobile);
 }

+ 2 - 0
src/main/java/com/ads/business/dao/DocDao.java

@@ -31,4 +31,6 @@ public interface DocDao extends BaseMapper<Doc> {
     Page<DocListResponse> findPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper<DocListResponse> wrapper);
 
     List<DocListResponse> findList(@Param(Constants.WRAPPER)QueryWrapper<DocListResponse> wrapper);
+
+
 }

+ 1 - 1
src/main/java/com/ads/business/service/DocConversationRelService.java

@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface DocConversationRelService extends IService<DocConversationRel> {
 
-    List<String> getListByDocId(Long id);
+    List<String> getListByDocId(Long id,String mobile);
 }

+ 2 - 2
src/main/java/com/ads/business/service/impl/DocConversationRelServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class DocConversationRelServiceImpl extends ServiceImpl<DocConversationRelDao, DocConversationRel> implements DocConversationRelService {
 
     @Override
-    public List<String> getListByDocId(Long id) {
-        return baseMapper.getListByDocId(id);
+    public List<String> getListByDocId(Long id,String mobile) {
+        return baseMapper.getListByDocId(id,mobile);
     }
 }

+ 4 - 4
src/main/java/com/ads/business/service/impl/DocServiceImpl.java

@@ -555,7 +555,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
                 //手机号不为空,群组不为空
                 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);
                     if (!docRoleMobiles.contains(userInfo.getMobile())) {
                         continue;
@@ -564,7 +564,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
                 //手机号为空,群组不为空
                 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())) {
                         continue;
                     }
@@ -597,7 +597,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
         //手机号不为空,群组不为空
         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);
             if (!docRoleMobiles.contains(userInfo.getMobile())) {
                 return true;
@@ -606,7 +606,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
         //手机号为空,群组不为空
         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())) {
                 return true;
             }

+ 1 - 1
src/main/resources/mapper/DocConversationRelDao.xml

@@ -22,7 +22,7 @@
             hsay_doc_conversation_rel hdcr
             LEFT JOIN hsay_conversation_user_rel hcur ON hdcr.chat_id = hcur.chat_id
         WHERE
-            hdcr.doc_id =  #{id}
+            hdcr.doc_id =  #{id} and hcur.mobile = #{mobile}
 
     </select>