From f749d4e8a7f7d61d082d0255f3e3c906b9c37baf Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 26 Jul 2024 09:52:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(87542):=20=E3=80=90=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E3=80=91=E8=BF=9B=E5=85=A5=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/standard/entity/LawsNewsFeed.java | 10 ++++++++-- .../service/impl/LawsNewsFeedServiceImpl.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java index f2d50a7e..8ce9d67b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java @@ -94,8 +94,11 @@ public class LawsNewsFeed implements Serializable { private java.lang.Integer readCount; /**编辑人*/ @ApiModelProperty(value = "编辑人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") private String writer; + /**编辑人 翻译*/ + @ApiModelProperty(value = "编辑人 翻译") + @TableField(exist = false) + private String writer_dictText; /**来源*/ @Excel(name = "来源", width = 15) @ApiModelProperty(value = "来源") @@ -109,9 +112,12 @@ public class LawsNewsFeed implements Serializable { @ApiModelProperty(value = "推送范围") @TableField(exist = false) - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") private String pushRange; + @ApiModelProperty(value = "推送范围 翻译") + @TableField(exist = false) + private String pushRange_dictText; + @ApiModelProperty(value = "是否可以编辑和删除") @TableField(exist = false) private Boolean isEditAndRemove; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java index d1b473ba..cca9c36a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.laws.standard.service.ILawsNewsFeedService; import com.jero.modules.laws.standard.service.ILawsPushRangeService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysUserService; import com.spire.ms.System.Collections.ArrayList; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -54,7 +55,8 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl userIdList = pushRangeList.stream().map(LawsPushRange::getUserId).collect(Collectors.toList()); lawsNewsFeed.setPushRange(StringUtils.join(userIdList, ",")); + // 翻译 + String writer = sysUserService.dictByIdsOrUserNames(lawsNewsFeed.getWriter(), ""); + lawsNewsFeed.setWriter_dictText(writer); + String pushRange = sysUserService.dictByIdsOrUserNames(lawsNewsFeed.getPushRange(), ""); + lawsNewsFeed.setPushRange_dictText(pushRange); } } return lawsNewsFeed;