Merge remote-tracking branch 'origin/master'

This commit is contained in:
yjz
2023-11-07 13:35:36 +08:00
@@ -497,7 +497,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
List<SysUser> userList = sysUserService.list(sysUserLambdaQueryWrapper);
List<String> nameList = userList.stream().map(SysUser::getRealname).collect(Collectors.toList());
List<String> nameList = userList.stream().map(e -> e.getRealname() + "(" + e.getUsername() + ")").collect(Collectors.toList());
resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ","));
} else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType())
|| LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) {