From 43c7cf553e5c78d81b8f23a043901926c45eb0cf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十二月 2024 18:46:00 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 26effca..2054ba1 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
@@ -18,9 +18,11 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
@@ -210,7 +212,6 @@
hiddenDanger.setMemberName(systemUser.getRealname());
//鎻愪氦浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -222,10 +223,9 @@
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId())
.last(" limit 1 "));
+
//澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
-
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -426,8 +426,6 @@
return hiddenDangerMapper.selectCount(wrapper);
}
-
-
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void dealHiddenDanger(HiddenDanger hiddenDanger){
@@ -605,6 +603,7 @@
if(Objects.isNull(hiddenDangerCate)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
}
+ model.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
@@ -625,6 +624,7 @@
.eq(Notices::getObjId,hiddenDanger.getId())
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
+ .orderByDesc(Notices::getId)
.last(" limit 1 ")
);
if(Objects.nonNull(notices)){
@@ -651,6 +651,7 @@
return;
}
hiddenDanger.setMemberName(memberUser.getRealname());
+ model.setMemberName(memberUser.getRealname());
SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
@@ -667,7 +668,7 @@
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper,hiddenDanger,
+ wxNoticeConfigMapper,model,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(checkUser.getOpenid().split(",")));
--
Gitblit v1.9.3