Merge remote-tracking branch 'origin/master'

jiangping

2024-09-24 6a2689a44840490a64cf66b37eb09e45eb1da244

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -343,6 +343,7 @@
            internalHomeVO.setNoticeCopyNum(
                    noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
                            &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
                            &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
                    ).count()
            );
        }
@@ -873,7 +874,8 @@
                if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
                    waitModel.setStatus(level.getStatus());
                    waitModel.setType(Constants.ONE);
                    waitModel.setTitle("审批人（抄送或签审批人）");
                    waitModel.setCheckDate(level.getCheckDate());
                    waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"审批人"));
                }else{
                    waitModel.setStatus(level.getStatus());
                    waitModel.setType(Constants.ZERO);