DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复缺少字段

Browse Source
This commit is contained in:
86156
2025-09-04 15:13:35 +08:00
parent 6fe5e8017e
commit 8552119fd4
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@@ -1,3 +1,4 @@
{ {
"java.compile.nullAnalysis.mode": "automatic" "java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "interactive"
} }

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java
View File

@@ -232,6 +232,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
// 开始写入 // 开始写入
for (Long userId : workerIds) { for (Long userId : workerIds) {
SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserByIdIncludingDel(userId), SysUserVo.class); SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserByIdIncludingDel(userId), SysUserVo.class);
SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo(); SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo();
//如果sysUser为空就跳过 //如果sysUser为空就跳过
if (sysUser == null) { if (sysUser == null) {

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
public List<SysOssVo> listByIds(Collection<Long> ossIds) { public List<SysOssVo> listByIds(Collection<Long> ossIds) {
List<SysOssVo> list = new ArrayList<>(); List<SysOssVo> list = new ArrayList<>();
for (Long id : ossIds) { for (Long id : ossIds) {
SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); SysOssVo vo = baseMapper.selectVoById(id);
if (ObjectUtil.isNotNull(vo)) { if (ObjectUtil.isNotNull(vo)) {
list.add(this.matchingUrl(vo)); list.add(this.matchingUrl(vo));
} }
@@ -104,7 +104,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
@Override @Override
public void download(Long ossId, HttpServletResponse response) throws IOException { public void download(Long ossId, HttpServletResponse response) throws IOException {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); SysOssVo sysOss = baseMapper.selectVoById(ossId);
if (ObjectUtil.isNull(sysOss)) { if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!"); throw new ServiceException("文件数据不存在!");
} }

2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -208,7 +208,7 @@
<select id="selectListAndNotDel" resultMap="ClearUser"> <select id="selectListAndNotDel" resultMap="ClearUser">
select user_id,user_name, u.insure,nick_name,labor_cost from sys_user where del_flag ='0' select user_id,user_name,insure,nick_name,labor_cost from sys_user where del_flag ='0'
</select> </select>