diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 65d497d7..8ca8c258 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -52,11 +52,13 @@ public class RepairServiceImpl implements RepairService { List repairTasks = new ArrayList<>(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); for (RepairTask repairTask : repairTaskList) { - if (Objects.equals(deptId, 101L) && repairTask.getCompanyIds().contains("101")) { - repairTasks.add(repairTask); - } - if (Objects.equals(deptId, 102L) && repairTask.getCompanyIds().contains("102")) { - repairTasks.add(repairTask); + if (StringUtils.isNotBlank(repairTask.getCompanyIds())) { + if (Objects.equals(deptId, 101L) && repairTask.getCompanyIds().contains("101")) { + repairTasks.add(repairTask); + } + if (Objects.equals(deptId, 102L) && repairTask.getCompanyIds().contains("102")) { + repairTasks.add(repairTask); + } } } return repairTasks; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 12c8127f..323443cc 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -143,7 +143,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, - update_time, + + update_time, + company_id, @@ -180,7 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createBy}, - NOW(), + + #{updateTime}, + #{companyId}, @@ -445,7 +449,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" part_name as partTotalName, file_ids as fileIds, su.nick_name as repairer, - rar.remark + rar.remark as remark, + rar.id as id from repair_apply_record rar left join ma_supplier_info msi on msi.supplier_id = rar.supplier_id left join sys_user su on su.user_id = rar.repairer