1

notes-address/src/main/java/com/zjty/tynotes/address/server/dao/NoticeDao.java

@@ -16,4 +16,6 @@ public interface NoticeDao extends MongoRepository<Notice,String> {
     List<Notice> findAllByApplyIdAndIsRead(String applyId,String isRead);
 
     List<Notice> findAllByApplyId(String applyId);
+
+    List<Notice> findAllByWorkId(String workId);
 }

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/ConversionServiceImpl.java

 package com.zjty.tynotes.job.basic.service.impl;
 
+import com.zjty.tynotes.address.server.dao.NoticeDao;
+import com.zjty.tynotes.address.server.entity.Notice;
+import com.zjty.tynotes.address.server.service.NoticeService;
 import com.zjty.tynotes.job.basic.entity.database.Attachment;
 import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.response.WorkOverTime;
@@ -28,7 +31,8 @@ public class ConversionServiceImpl implements ConversionService {
     AttachmentRepository attachmentRepository;
     @Autowired
     PriviceService priviceService;
-
+    @Autowired
+    private NoticeDao noticeDao;
     @Override
     public WorkVo workToVo(Work work) {
         log.info("开始转换对象");
@@ -40,7 +44,12 @@ public class ConversionServiceImpl implements ConversionService {
         List<String> uid=work.getCrewList();
         List<Attachment> attachments=new ArrayList<>();
         List<String> attachIds=work.getAttachment();
-
+      List<Notice> list= noticeDao.findAllByWorkId(work.getId());
+        list.forEach(i->{
+            if (i.getIsAgree()==null || i.getIsAgree().equals("1")){
+                uid.remove(i.getBorrowUserId());
+            }
+        });
         if (uid!=null && uid.size()!=0){
             for (String id:uid){
                 users.add(iUserService.findUserById(id));