diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 8c1aea125..ab60df069 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -689,6 +689,6 @@ ADD COLUMN `platform_certification_inventory_id` varchar(36) NULL COMMENT '平 -- 参数模板管理 添加维护人 2024-01-05 未同步生产环境 ALTER TABLE `params_template` -ADD COLUMN `maintainer_id` varchar(3000) NULL COMMENT '维护人' AFTER `status`; +ADD COLUMN `maintainer` varchar(3000) NULL COMMENT '维护人' AFTER `status`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index cf9780d0e..fcf0451bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -122,13 +122,13 @@ public class ParamsTemplateEOController extends JeroController records = pageList.getRecords(); if(ObjectUtil.isNotEmpty(records)){ List userIdList = records.stream() - .filter(e -> StringUtils.isNotBlank(e.getMaintainerId())) - .map(ParamsTemplateEO::getMaintainerId).distinct().collect(Collectors.toList()); + .filter(e -> StringUtils.isNotBlank(e.getMaintainer())) + .map(ParamsTemplateEO::getMaintainer).distinct().collect(Collectors.toList()); if(ObjectUtil.isNotEmpty(userIdList)){ List sysUserList = sysUserService.querySysUserListByIdList(userIdList); for (ParamsTemplateEO record : records) { - if(StringUtils.isNotBlank(record.getMaintainerId())){ - List userList = sysUserList.stream().filter(e -> record.getMaintainerId().contains(e.getId())).collect(Collectors.toList()); + if(StringUtils.isNotBlank(record.getMaintainer())){ + List userList = sysUserList.stream().filter(e -> record.getMaintainer().contains(e.getId())).collect(Collectors.toList()); if(ObjectUtil.isNotEmpty(userList)){ List collect = userList.stream().map(SysUser::getRealname).collect(Collectors.toList()); record.setMaintainerName(StringUtils.join(collect,",")); @@ -137,7 +137,7 @@ public class ParamsTemplateEOController extends JeroController