From 13323608a9657cc466c22f5da8466e8b65c8eb7c Mon Sep 17 00:00:00 2001 From: zhanyunjiu <787952492@qq.com> Date: Thu, 4 Aug 2022 11:57:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=20=20=E6=B2=A1=E6=9C=89=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=20?= =?UTF-8?q?=20=E6=9A=82=E6=97=B6=E4=B8=8D=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/farm/annotation/FarmMsgAspect.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/annotation/FarmMsgAspect.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/annotation/FarmMsgAspect.java index 1dd57ec0..e577130f 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/annotation/FarmMsgAspect.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/annotation/FarmMsgAspect.java @@ -20,7 +20,6 @@ import cn.iocoder.yudao.module.farm.dal.mysql.taskCate.TaskCateMapper; import cn.iocoder.yudao.module.farm.service.area.AreaService; import cn.iocoder.yudao.module.farm.service.task.TaskService; import cn.iocoder.yudao.module.system.dal.dataobject.CpUser.CpUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.mysql.CpUser.CpUserMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; import lombok.extern.slf4j.Slf4j; @@ -109,20 +108,20 @@ public class FarmMsgAspect { //草稿不发送 return object; } - //创建 更新 删除 发送信息 - if (farmMsg.operation().equals(FarmMsgTypeEnum.CREATE) || farmMsg.operation().equals(FarmMsgTypeEnum.UPDATE) - || farmMsg.operation().equals(FarmMsgTypeEnum.DELETE)){ - //接受消息的人 - String toUserStr = this.assembleCpUserId(farmMsg.type(), farmMsgDTO.getId()); - //发起人 - AdminUserDO adminUser = adminUserMapper.selectOne(AdminUserDO::getId, getLoginUserId()); - CpUserDO user = cpUserMapper.selectOne(CpUserDO::getUserId, adminUser.getCpUserId()); - - if (!farmMsgDTO.getNoSendMsg()){ - //企业微信小程序通知消息 - this.sendMiniMsg(user, farmMsgDTO, toUserStr); - } - } +// //创建 更新 删除 发送信息 +// if (farmMsg.operation().equals(FarmMsgTypeEnum.CREATE) || farmMsg.operation().equals(FarmMsgTypeEnum.UPDATE) +// || farmMsg.operation().equals(FarmMsgTypeEnum.DELETE)){ +// //接受消息的人 +// String toUserStr = this.assembleCpUserId(farmMsg.type(), farmMsgDTO.getId()); +// //发起人 +// AdminUserDO adminUser = adminUserMapper.selectOne(AdminUserDO::getId, getLoginUserId()); +// CpUserDO user = cpUserMapper.selectOne(CpUserDO::getUserId, adminUser.getCpUserId()); +// +// if (!farmMsgDTO.getNoSendMsg()){ +// //企业微信小程序通知消息 +// this.sendMiniMsg(user, farmMsgDTO, toUserStr); +// } +// } //插入日志 LogMsgDO logMsgDO = LogMsgDO.builder()