|
|
@@ -1073,7 +1073,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserJzgInfo.setRoleNames(userRole.stream().map(SysRole::getName).collect(Collectors.toList()));
|
|
|
|
|
|
List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
|
|
|
- (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getId()));
|
|
|
+ (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getUserId()));
|
|
|
sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
|
|
|
List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(), baseController.getUserSystemCode());
|
|
|
sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
|
|
|
@@ -1166,7 +1166,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
if(sysUploadFiles != null){
|
|
|
action.setFileUrl(sysUploadFiles.getDownloadUrl());
|
|
|
action.setUserId(String.valueOf(userId));
|
|
|
- action.setFileType(sysUploadFiles.getFileType());
|
|
|
+ //action.setFileType(sysUploadFiles.getFileType());
|
|
|
action.setFileName(sysUploadFiles.getFileName());
|
|
|
action.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
}else{
|