productDev/dmvisit.git

			@@ -285,14 +285,16 @@
			if(CollectionUtils.isNotEmpty(noticesList)){
			//待我处理的数据
			internalHomeVO.setNoticeWaitNum(
			noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
			noticesList.stream().filter(i->
			Constants.equalsInteger(i.getUserId(),memberId)
			&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
			&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
			).count()
			);
			//已处理数据
			internalHomeVO.setNoticeDealNum(
			noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
			noticesList.stream().filter(i->
			Constants.equalsInteger(i.getUserId(),memberId)
			&&StringUtils.equals(i.getParam4(),i.getUserId().toString())
			&&Constants.equalsInteger(i.getStatus(),Constants.ONE)
			&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
			@@ -303,9 +305,10 @@
			noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
			);
			//抄送我的数据
			internalHomeVO.setNoticeCopyNum(
			internalHomeVO.setNoticeCopyNum(
			noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
			&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
			&&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
			).count()
			);
			}
			@@ -563,7 +566,7 @@
			approve.setTemplatId(approveTempl.getId());
			approve.setChekorId(memberId);
			approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
			approve.setStatusInfo(i==0?"审批中":"处理中");
			approve.setStatusInfo(i==0?"审批中":"待处理");
			approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"审批中":approveParam.getRemark());
			approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
			approve.setObjId(businessId);
			@@ -921,7 +924,6 @@
			}else{
			waitModel.setStatus(level.getStatus());
			waitModel.setType(Constants.ZERO);
			//waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人");
			waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人");

			}
			@@ -1165,7 +1167,7 @@
			.last(" limit 1")
			);
			if(Objects.isNull(approve)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到审批数据");
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"申请已被他人审批");
			}
			if(!approve.getStatus().equals(Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批记录状态错误!");