sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

项目、任务 没有成员选择 暂时不发送消息

Browse Source
This commit is contained in:
zhanyunjiu
2022-08-04 11:57:07 +08:00
parent 6a88008a51
commit 13323608a9
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/annotation/FarmMsgAspect.java
+14 -15
View File
@@ -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.area.AreaService;
import cn.iocoder.yudao.module.farm.service.task.TaskService; 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.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.CpUser.CpUserMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -109,20 +108,20 @@ public class FarmMsgAspect {
//草稿不发送 //草稿不发送
return object; return object;
} }
//创建 更新 删除 发送信息 // //创建 更新 删除 发送信息
if (farmMsg.operation().equals(FarmMsgTypeEnum.CREATE) || farmMsg.operation().equals(FarmMsgTypeEnum.UPDATE) // if (farmMsg.operation().equals(FarmMsgTypeEnum.CREATE) || farmMsg.operation().equals(FarmMsgTypeEnum.UPDATE)
|| farmMsg.operation().equals(FarmMsgTypeEnum.DELETE)){ // || farmMsg.operation().equals(FarmMsgTypeEnum.DELETE)){
//接受消息的人 // //接受消息的人
String toUserStr = this.assembleCpUserId(farmMsg.type(), farmMsgDTO.getId()); // String toUserStr = this.assembleCpUserId(farmMsg.type(), farmMsgDTO.getId());
//发起人 // //发起人
AdminUserDO adminUser = adminUserMapper.selectOne(AdminUserDO::getId, getLoginUserId()); // AdminUserDO adminUser = adminUserMapper.selectOne(AdminUserDO::getId, getLoginUserId());
CpUserDO user = cpUserMapper.selectOne(CpUserDO::getUserId, adminUser.getCpUserId()); // CpUserDO user = cpUserMapper.selectOne(CpUserDO::getUserId, adminUser.getCpUserId());
//
if (!farmMsgDTO.getNoSendMsg()){ // if (!farmMsgDTO.getNoSendMsg()){
//企业微信小程序通知消息 // //企业微信小程序通知消息
this.sendMiniMsg(user, farmMsgDTO, toUserStr); // this.sendMiniMsg(user, farmMsgDTO, toUserStr);
} // }
} // }
//插入日志 //插入日志
LogMsgDO logMsgDO = LogMsgDO.builder() LogMsgDO logMsgDO = LogMsgDO.builder()