From f0ed73b8faa5e86ac79dce309c8a28bb1b918554 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 16 四月 2025 16:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 2762e20..30efcd9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -302,7 +302,7 @@
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)
@@ -520,7 +520,7 @@
}
if(j==0){
//璁垮浜哄憳涓嶇敓鎴愭璁板綍
- if(!(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)&&Constants.equalsInteger(createMember.getType(),Constants.ONE))){
+ if(!(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)&&Constants.equalsInteger(applyMember.getType(),Constants.ONE))){
//榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
Notices notices = new Notices();
notices.setCreateDate(new Date());
--
Gitblit v1.9.3