wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-30 18:45:21 +08:00
parent 1669dc52ff 92213dccd5
commit b2c780b3e6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
View File

@ -110,7 +110,8 @@ public class TRemindersServiceImpl extends CrudServiceImpl<TRemindersDao, TRemin
logger.info("无流程创建者"); logger.info("无流程创建者");
return; return;
} }
String content = "【催办通知】" + dto.getSponsor().getRealName() + "发起的流程 " + resourceName + dto.getProcessType() + SysUserDTO creatorDto = sysUserService.get(Long.parseLong(creator));
String content = "【催办通知】" + creatorDto.getRealName() + "发起的流程 " + resourceName + dto.getProcessType() +
" 已进入审核节点：" + task.getName() + " 已进入审核节点：" + task.getName() +
"；当前审核人指派为您"; "；当前审核人指派为您";
if (allowEntrust) { if (allowEntrust) {

2
renren-admin/src/main/resources/db/V8.0__create_reminders.sql
View File

@ -12,6 +12,8 @@ CREATE TABLE `t_reminders` (
`additional1` varchar(255) NULL COMMENT '附加备用字段1', `additional1` varchar(255) NULL COMMENT '附加备用字段1',
`additional2` longtext NULL COMMENT '附加备用字段2', `additional2` longtext NULL COMMENT '附加备用字段2',
`additional3` longtext NULL COMMENT '附加备用字段3', `additional3` longtext NULL COMMENT '附加备用字段3',
`creator` bigint NOT NULL COMMENT '创建人',
`create_date` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '催办信息' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '催办信息' ROW_FORMAT = DYNAMIC;
alter table `t_reminders` ADD INDEX `instance_id`(`instance_id`) USING BTREE comment '催办流程实例ID'; alter table `t_reminders` ADD INDEX `instance_id`(`instance_id`) USING BTREE comment '催办流程实例ID';