bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
mashuai 2025-06-04 14:50:57 +08:00
parent 7c891101c6
commit c8fad7b535
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -52,11 +52,13 @@ public class RepairServiceImpl implements RepairService {
List<RepairTask> repairTasks = new ArrayList<>(); List<RepairTask> repairTasks = new ArrayList<>();
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
for (RepairTask repairTask : repairTaskList) { for (RepairTask repairTask : repairTaskList) {
if (Objects.equals(deptId, 101L) && repairTask.getCompanyIds().contains("101")) { if (StringUtils.isNotBlank(repairTask.getCompanyIds())) {
repairTasks.add(repairTask); 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 (Objects.equals(deptId, 102L) && repairTask.getCompanyIds().contains("102")) {
repairTasks.add(repairTask);
}
} }
} }
return repairTasks; return repairTasks;

11
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
View File

@ -143,7 +143,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
update_by, update_by,
</if> </if>
update_time, <if test="updateTime != null and updateTime != ''">
update_time,
</if>
<if test="companyId != null"> <if test="companyId != null">
company_id, company_id,
</if> </if>
@ -180,7 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
#{createBy}, #{createBy},
</if> </if>
NOW(), <if test="updateTime != null and updateTime != ''">
#{updateTime},
</if>
<if test="companyId != null"> <if test="companyId != null">
#{companyId}, #{companyId},
</if> </if>
@ -445,7 +449,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
part_name as partTotalName, part_name as partTotalName,
file_ids as fileIds, file_ids as fileIds,
su.nick_name as repairer, su.nick_name as repairer,
rar.remark rar.remark as remark,
rar.id as id
from repair_apply_record rar from repair_apply_record rar
left join ma_supplier_info msi on msi.supplier_id = rar.supplier_id left join ma_supplier_info msi on msi.supplier_id = rar.supplier_id
left join sys_user su on su.user_id = rar.repairer left join sys_user su on su.user_id = rar.repairer