From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index bc8fae7..10fc09b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -102,6 +102,9 @@
@Autowired
private DingTalk dingTalk;
+
+ @Autowired
+ private DdNoticeConfigMapper ddNoticeConfigMapper;
@Override
@@ -255,7 +258,10 @@
if(StringUtils.isNotBlank(member.getDdId())){
dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
member.getDdId(),
- dingTalk.getHiddenDangerNoticeMsg(hiddenDanger));
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
+ dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
}
return hiddenDanger.getId();
@@ -809,7 +815,10 @@
if(StringUtils.isNotBlank(member.getDdId())){
dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
member.getDdId(),
- dingTalk.getHiddenDangerNoticeMsg(hiddenDanger));
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
+ dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
}
}
--
Gitblit v1.9.3