WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数模板管理

Browse Source
This commit is contained in:
zhn
2024-01-05 10:56:01 +08:00
parent 7e1a7c45fd
commit 0c5b956327
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+1 -1
View File
@@ -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`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+5 -5
View File
@@ -122,13 +122,13 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
List<ParamsTemplateEO> records = pageList.getRecords();
if(ObjectUtil.isNotEmpty(records)){
List<String> 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<SysUser> sysUserList = sysUserService.querySysUserListByIdList(userIdList);
for (ParamsTemplateEO record : records) {
if(StringUtils.isNotBlank(record.getMaintainerId())){
List<SysUser> userList = sysUserList.stream().filter(e -> record.getMaintainerId().contains(e.getId())).collect(Collectors.toList());
if(StringUtils.isNotBlank(record.getMaintainer())){
List<SysUser> userList = sysUserList.stream().filter(e -> record.getMaintainer().contains(e.getId())).collect(Collectors.toList());
if(ObjectUtil.isNotEmpty(userList)){
List<String> collect = userList.stream().map(SysUser::getRealname).collect(Collectors.toList());
record.setMaintainerName(StringUtils.join(collect,","));
@@ -137,7 +137,7 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
//权限
if(administrator
|| currentUser.getUsername().equals(record.getCreateBy())
|| (StringUtils.isNotBlank(record.getMaintainerId()) && record.getMaintainerId().contains(currentUser.getUsername()))){
|| (StringUtils.isNotBlank(record.getMaintainer()) && record.getMaintainer().contains(currentUser.getUsername()))){
record.setAuthorityFlag(FlagEnum.ZERO.getValue());
}else{
record.setAuthorityFlag(FlagEnum.ONE.getValue());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class ParamsTemplateEO implements Serializable {
@ApiModelProperty(value = "维护人")
private java.lang.String maintainerId;
private java.lang.String maintainer;
@TableField(exist = false)
@ApiModelProperty(value = "维护人回显")