@@ -96,6 +96,7 @@ public class ExpertAdminExpertManageAssembler { | |||||
expertSource = assembleTagName(expertSource); | expertSource = assembleTagName(expertSource); | ||||
expertAdminExpertManageListVO.setExpertSource(expertSource); | expertAdminExpertManageListVO.setExpertSource(expertSource); | ||||
} | } | ||||
expertAdminExpertManageListVO.setCreateTime(r.getCreateTime()); | |||||
return expertAdminExpertManageListVO; | return expertAdminExpertManageListVO; | ||||
}).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
@@ -456,6 +456,8 @@ public class ExpertUserInfoAssembler { | |||||
DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.EDU.getKey()))); | DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.EDU.getKey()))); | ||||
expertAdminExpertManageListDTO.setRecommendedWay( | expertAdminExpertManageListDTO.setRecommendedWay( | ||||
DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey()))); | DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey()))); | ||||
expertAdminExpertManageListDTO.setCreateTime(expertUserFullInfo.getCreateOn()); | |||||
return expertAdminExpertManageListDTO; | return expertAdminExpertManageListDTO; | ||||
} | } | ||||
@@ -130,4 +130,9 @@ public class ExpertAdminExpertManageListDTO { | |||||
* 专家来源 | * 专家来源 | ||||
*/ | */ | ||||
private List<TagFieldInfo> expertSource; | private List<TagFieldInfo> expertSource; | ||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private LocalDateTime createTime; | |||||
} | } |
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import java.time.LocalDateTime; | |||||
import java.util.List; | import java.util.List; | ||||
/** | /** | ||||
@@ -53,4 +54,7 @@ public class ExpertAdminExpertManageListVO { | |||||
@ApiModelProperty(value = "专家来源") | @ApiModelProperty(value = "专家来源") | ||||
private List<TagFieldInfo> expertSource; | private List<TagFieldInfo> expertSource; | ||||
@ApiModelProperty(value = "创建时间") | |||||
private LocalDateTime createTime; | |||||
} | } |
@@ -20,21 +20,21 @@ public enum RoleEnum { | |||||
/** | /** | ||||
* 系统角色枚举 | * 系统角色枚举 | ||||
*/ | */ | ||||
NORMAL_MEMBER("普通用户",6), | |||||
NORMAL_MEMBER("普通用户", 6), | |||||
EXPERT("专家",5), | |||||
EXPERT("专家", 5), | |||||
COMPANY_MANAGER("单位管理员",4), | |||||
COMPANY_MANAGER("单位管理员", 4), | |||||
EXPERT_ADMIN("专家管理员",2), | |||||
EXPERT_ADMIN("专家管理员", 2), | |||||
REGION_MANAGER("区域管理员",3), | |||||
REGION_MANAGER("区域管理员", 3), | |||||
SUPER_ADMIN("超级管理员",1), | |||||
SUPER_ADMIN("超级管理员", 1), | |||||
VISITOR("访客",7), | |||||
VISITOR("访客", 7), | |||||
DASHBOARD("工作台",8); | |||||
DASHBOARD("工作台", 8); | |||||
private final String desc; | private final String desc; | ||||
@@ -43,7 +43,7 @@ public enum RoleEnum { | |||||
*/ | */ | ||||
private final Integer level; | private final Integer level; | ||||
RoleEnum(String desc,Integer level) { | |||||
RoleEnum(String desc, Integer level) { | |||||
this.desc = desc; | this.desc = desc; | ||||
this.level = level; | this.level = level; | ||||
} | } | ||||
@@ -52,24 +52,24 @@ public enum RoleEnum { | |||||
return this.name().equals(name); | return this.name().equals(name); | ||||
} | } | ||||
public static RoleEnum mathByName(String name){ | |||||
if(StringUtils.isBlank(name)){ | |||||
public static RoleEnum mathByName(String name) { | |||||
if (StringUtils.isBlank(name)) { | |||||
return null; | return null; | ||||
} | } | ||||
for(RoleEnum roleEnum : RoleEnum.values()){ | |||||
if(roleEnum.name().equals(name)){ | |||||
for (RoleEnum roleEnum : RoleEnum.values()) { | |||||
if (roleEnum.name().equals(name)) { | |||||
return roleEnum; | return roleEnum; | ||||
} | } | ||||
} | } | ||||
return null; | return null; | ||||
} | } | ||||
public static RoleEnum checkHigherRole(List<String> roleCodes){ | |||||
public static RoleEnum checkHigherRole(List<String> roleCodes) { | |||||
RoleEnum res = null; | RoleEnum res = null; | ||||
for(String roleCode : roleCodes){ | |||||
for (String roleCode : roleCodes) { | |||||
RoleEnum roleEnum = mathByName(roleCode); | RoleEnum roleEnum = mathByName(roleCode); | ||||
if(Objects.isNull(res) || | |||||
(Objects.nonNull(roleEnum) && roleEnum.getLevel() < res.getLevel())){ | |||||
if (Objects.isNull(res) || | |||||
(Objects.nonNull(roleEnum) && roleEnum.getLevel() < res.getLevel())) { | |||||
res = roleEnum; | res = roleEnum; | ||||
} | } | ||||
} | } | ||||