diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java index 5830238e..7d2ee86c 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java @@ -259,7 +259,11 @@ public class TranslationAspect { continue; //跳过循环 } if (!StringUtils.isEmpty(table) && StrUtil.isNotBlank(text)) { - tmpValue = commonAPI.queryTableDictTextByKey(table, text, code, k.trim()); + if ("sys_user".equals(table)&&"realname".equals(text)&&"id".equals(code)){ + tmpValue = commonAPI.translateUserRealNameFromTable(k.trim()); + }else { + tmpValue = commonAPI.queryTableDictTextByKey(table, text, code, k.trim()); + } } else { List listNew = listDict.stream() .filter(o -> Objects.equals(o.getDictCode(), code) && diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubJoinTeam.java b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubJoinTeam.java index 474b8810..18e2e5b8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubJoinTeam.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubJoinTeam.java @@ -83,6 +83,7 @@ public class LawsClubJoinTeam implements Serializable { private String contacts; @ApiModelProperty(value = "备注") + @Excel(name = "备注", width = 20) private String remark; @ApiModelProperty(value = "创建人") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeeting.java b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeeting.java index 1379ec5d..35564c61 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeeting.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeeting.java @@ -79,6 +79,7 @@ public class LawsClubMeeting implements Serializable { @ApiModelProperty(value = "通知部门专业模块") @Dict(dicCode = "professional_module") + @Excel(name = "通知部门专业模块", dicCode = "professional_module") private String informSpecializedModule; @ApiModelProperty(value = "是否宣贯 0-否 1-是") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeetingMember.java b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeetingMember.java index 819e4675..10ea99f3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeetingMember.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/entity/LawsClubMeetingMember.java @@ -52,7 +52,7 @@ public class LawsClubMeetingMember implements Serializable { private String departId; @ApiModelProperty(value = "参会部门专业模块") - @Excel(name = "参会部门专业模块", dicCode = "professional_module") + @Excel(name = "参会部门专业模块", width = 20, dicCode = "professional_module") @Dict(dicCode = "professional_module") private String meetingSpecializedModule; @@ -62,6 +62,7 @@ public class LawsClubMeetingMember implements Serializable { private String meetingFileId; @ApiModelProperty(value = "备注") + @Excel(name = "备注",width = 20) private String remark; @ApiModelProperty(value = "创建人")