参数模板管理
This commit is contained in:
@@ -689,6 +689,6 @@ ADD COLUMN `platform_certification_inventory_id` varchar(36) NULL COMMENT '平
|
|||||||
|
|
||||||
-- 参数模板管理 添加维护人 2024-01-05 未同步生产环境
|
-- 参数模板管理 添加维护人 2024-01-05 未同步生产环境
|
||||||
ALTER TABLE `params_template`
|
ALTER TABLE `params_template`
|
||||||
ADD COLUMN `maintainer_id` varchar(3000) NULL COMMENT '维护人' AFTER `status`;
|
ADD COLUMN `maintainer` varchar(3000) NULL COMMENT '维护人' AFTER `status`;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -122,13 +122,13 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
|
|||||||
List<ParamsTemplateEO> records = pageList.getRecords();
|
List<ParamsTemplateEO> records = pageList.getRecords();
|
||||||
if(ObjectUtil.isNotEmpty(records)){
|
if(ObjectUtil.isNotEmpty(records)){
|
||||||
List<String> userIdList = records.stream()
|
List<String> userIdList = records.stream()
|
||||||
.filter(e -> StringUtils.isNotBlank(e.getMaintainerId()))
|
.filter(e -> StringUtils.isNotBlank(e.getMaintainer()))
|
||||||
.map(ParamsTemplateEO::getMaintainerId).distinct().collect(Collectors.toList());
|
.map(ParamsTemplateEO::getMaintainer).distinct().collect(Collectors.toList());
|
||||||
if(ObjectUtil.isNotEmpty(userIdList)){
|
if(ObjectUtil.isNotEmpty(userIdList)){
|
||||||
List<SysUser> sysUserList = sysUserService.querySysUserListByIdList(userIdList);
|
List<SysUser> sysUserList = sysUserService.querySysUserListByIdList(userIdList);
|
||||||
for (ParamsTemplateEO record : records) {
|
for (ParamsTemplateEO record : records) {
|
||||||
if(StringUtils.isNotBlank(record.getMaintainerId())){
|
if(StringUtils.isNotBlank(record.getMaintainer())){
|
||||||
List<SysUser> userList = sysUserList.stream().filter(e -> record.getMaintainerId().contains(e.getId())).collect(Collectors.toList());
|
List<SysUser> userList = sysUserList.stream().filter(e -> record.getMaintainer().contains(e.getId())).collect(Collectors.toList());
|
||||||
if(ObjectUtil.isNotEmpty(userList)){
|
if(ObjectUtil.isNotEmpty(userList)){
|
||||||
List<String> collect = userList.stream().map(SysUser::getRealname).collect(Collectors.toList());
|
List<String> collect = userList.stream().map(SysUser::getRealname).collect(Collectors.toList());
|
||||||
record.setMaintainerName(StringUtils.join(collect,","));
|
record.setMaintainerName(StringUtils.join(collect,","));
|
||||||
@@ -137,7 +137,7 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
|
|||||||
//权限
|
//权限
|
||||||
if(administrator
|
if(administrator
|
||||||
|| currentUser.getUsername().equals(record.getCreateBy())
|
|| 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());
|
record.setAuthorityFlag(FlagEnum.ZERO.getValue());
|
||||||
}else{
|
}else{
|
||||||
record.setAuthorityFlag(FlagEnum.ONE.getValue());
|
record.setAuthorityFlag(FlagEnum.ONE.getValue());
|
||||||
|
|||||||
+1
-1
@@ -102,7 +102,7 @@ public class ParamsTemplateEO implements Serializable {
|
|||||||
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "维护人")
|
@ApiModelProperty(value = "维护人")
|
||||||
private java.lang.String maintainerId;
|
private java.lang.String maintainer;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "维护人回显")
|
@ApiModelProperty(value = "维护人回显")
|
||||||
|
|||||||
Reference in New Issue
Block a user