diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index addae0ab..6222cb17 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -94,6 +94,9 @@ public class QmsPdiTaskRecordControllerService { * 不合格物料分页查询(已完成+不合格+存在不合格检测项,关联工单状态) */ public PageData searchDefect(QmsPdiTaskRecordDefectSearchQO request) { + // 填充当前登录用户ID(用于数据权限过滤) + request.setCurrentUserId(UserUtil.getUserId()); + Page page = taskRecordService.searchDefect(request); PageData result = new PageData<>(); result.setItems(page.getRecords()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java index c9b1b898..38ccf926 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java @@ -57,4 +57,9 @@ public class QmsPdiTaskRecordDefectSearchQO { * 每页条数 */ private Integer pageSize = 20; + + /** + * 当前登录用户ID(用于数据权限过滤,由后端自动填充) + */ + private Long currentUserId; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml index bff3f47d..19db58d3 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml @@ -116,6 +116,19 @@ AND ir.inspection_item_results = false ) ) + + AND ( + + (it.id IS NULL AND (r.inspector_id = #{request.currentUserId} OR t.assistant_id = #{request.currentUserId})) + OR + + (it.id IS NOT NULL AND EXISTS ( + SELECT 1 + FROM qms_issue_ticket_process p + WHERE p.issue_ticket_id = it.id + AND p.handler_user_id = #{request.currentUserId} + )) + ) AND r.inspection_type = #{request.inspectionType}