Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
-1
@@ -497,7 +497,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
|
sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
|
||||||
List<SysUser> userList = sysUserService.list(sysUserLambdaQueryWrapper);
|
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, ","));
|
resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ","));
|
||||||
} else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType())
|
} else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType())
|
||||||
|| LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) {
|
|| LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user