diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java index 27d4101..bd00ed2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -16,6 +16,11 @@ public class RepairTaskDetails { */ @ApiModelProperty(value = "id") private Long id; + + /** 用户ID */ + @ApiModelProperty(value = "userId") + private Long userId; + /** * 任务ID */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 5832d74..fe4cc6b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -50,6 +50,7 @@ public class RepairServiceImpl implements RepairService { public List getRepairMaTypeList(RepairTaskDetails bean) { Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); bean.setCompanyId(companyId); + bean.setUserId(SecurityUtils.getLoginUser().getUserid()); List repairMaTypeList = mapper.getRepairMaTypeList(bean); return repairMaTypeList; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml index d81e3ba..313dfcf 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml @@ -207,7 +207,8 @@ left join ma_machine mm on mm.ma_id = rad.ma_id left join sys_user su on rad.repairer = su.user_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id - where rad.task_id = #{taskId} + LEFT JOIN ma_type_repair mtr on mtr.type_id = rad.type_id + where rad.task_id = #{taskId} and mtr.user_id = #{userId} and rad.company_id = #{companyId}