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 bee38baa..d3e816ba 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 @@ -13,7 +13,6 @@ import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDefectPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordStatusItemGroupVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordSummaryVO; -import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsPdiComponentAnagement; import com.nflg.wms.repository.entity.QmsPdiDetectionRules; import com.nflg.wms.repository.entity.QmsPdiDetectionRulesDeliveryItem; @@ -96,8 +95,6 @@ public class QmsPdiTaskRecordControllerService { */ public PageData search(QmsPdiTaskRecordSearchQO request) { // 填充当前登录用户ID(用于数据权限过滤) - request.setCurrentUserId(UserUtil.getUserId()); - Page page = taskRecordService.search(request); PageData result = new PageData<>(); result.setItems(page.getRecords()); @@ -112,8 +109,6 @@ 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-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml index 9cd6cec6..09710371 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml @@ -56,11 +56,6 @@ AND t.warehouse_no = #{request.warehouseNo} - - AND ( - r.inspector_id = #{request.currentUserId} - OR t.assistant_id = #{request.currentUserId} - ) AND ( t.inspection_inspection IS NULL @@ -113,32 +108,6 @@ AND t.inspection_enable IN (2, 3) AND t.inspection_inspection = 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 ( - r.inspector_id = #{request.currentUserId} - OR t.assistant_id = #{request.currentUserId} - OR EXISTS ( - SELECT 1 - FROM qms_issue_ticket_process p - WHERE p.issue_ticket_id = it.id - AND p.handler_user_id = #{request.currentUserId} - ) - OR EXISTS ( - SELECT 1 - FROM qms_issue_ticket_process p - LEFT JOIN "user" handler_user ON handler_user.id = p.handler_user_id - LEFT JOIN user_interior handler_ui ON handler_ui.user_id = handler_user.id - LEFT JOIN department handler_dept ON handler_dept.id = handler_ui.dept_id - WHERE p.issue_ticket_id = it.id - AND handler_dept.head_user_id = #{request.currentUserId} - ) - )) - ) AND r.inspection_type = #{request.inspectionType}