QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(87542): 【阻塞】进入动态消息出现操作失败

Browse Source
This commit is contained in:
yjz
2024-07-26 09:52:05 +08:00
parent ebb008d71d
commit f749d4e8a7
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+8 -2
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+14 -1
View File
@@ -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<LawsNewsFeedMapper, Law
private ISysDictItemService sysDictItemService;
@Resource
private ILawsHomeSearchService lawsHomeSearchService;
@Resource
private ISysUserService sysUserService;
/**
* 分页查询
*
@@ -117,6 +119,12 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
// 不能编辑和删除
lawsNewsFeed.setIsEditAndRemove(false);
}
// 翻译
String writer = sysUserService.dictByIdsOrUserNames(lawsNewsFeed.getWriter(), "");
lawsNewsFeed.setWriter_dictText(writer);
String pushRange = sysUserService.dictByIdsOrUserNames(lawsNewsFeed.getPushRange(), "");
lawsNewsFeed.setPushRange_dictText(pushRange);
});
}
@@ -308,6 +316,11 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
if (CollectionUtils.isNotEmpty(pushRangeList)) {
List<String> 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;