diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 4f2fa5230..704755bfe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -235,11 +235,17 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, currentUserId)); + + initiator = currentUser.getUsername(); }else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_SUBMIT_MSG.getValue())){ String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); @@ -247,10 +253,14 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); msgContentEN = "The the Collection of Legislative Comments of "+serialNumber+" will expire tomorrow . Please check and address it in time."; msgTitle = "You have a Collection of Legislative Comments task completed"; + + initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); } //飞书跳转链接 @@ -263,6 +273,6 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, currentUserId)); + + initiator = currentUser.getUsername(); }else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){ String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); @@ -564,21 +570,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); //您GB 7258的法规技术评估流程将于明天结束,请及时查看处理 msgContentEN = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time."; msgTitle = "You have a Regulatory and technical assessment task to complete"; + + initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); } //飞书跳转链接 @@ -591,7 +605,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl categoryList, List technologyTerritoryList) {