1

src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestDetailServiceImpl.java

@@ -33,9 +33,11 @@ public class InspectionRequestDetailServiceImpl extends ServiceImpl<InspectionRe
     public IPage<MyInspectionListVO> getMyInspectionList(MyInspectionListVO query) {
         // 自动设置当前登录用户为 QC 人员
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
-        if (currentUser != null) {
-            query.setQcOperator(currentUser.getUsername());
+        if (currentUser == null || currentUser.getSite() == null || currentUser.getSite().trim().isEmpty()) {
+            throw new RuntimeException("当前登录工厂不能为空");
         }
+        query.setQcOperator(currentUser.getUsername());
+        query.setSite(currentUser.getSite());
         return baseMapper.getMyInspectionList(new Page<>(query.getPage(), query.getLimit()), query);
     }
 }

src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java

@@ -67,6 +67,12 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH
 
     @Override
     public PageUtils myPage(InspectionRequestHeader data){
+        // 强制使用当前登录工厂，避免前端漏传 site 导致跨工厂数据
+        SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+        if (currentUser == null || !StringUtils.hasText(currentUser.getSite())) {
+            throw new RuntimeException("当前登录工厂不能为空");
+        }
+        data.setSite(currentUser.getSite());
         IPage<InspectionRequestHeader> resultList = baseMapper.myPage(new Page<>(data.getPage(), data.getLimit()), data);
         return new PageUtils(resultList);
     }

src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java

@@ -5475,7 +5475,7 @@ public class QcServiceImpl implements QcService {
 
         List<TemplateDTO> templates = getTemplates(detail);
         if (templates == null || templates.isEmpty()) {
-            throw new RuntimeException("该供应商未维护此物料的检验模板");
+            throw new RuntimeException("未维护此物料的检验模板");
         }
 
         String inspectionNo = genInspectionNo(detail.getSite());
@@ -5489,7 +5489,7 @@ public class QcServiceImpl implements QcService {
                     getTemplateDetail(template.getTemplateId(),
                             detail.getSite(),
                             partAttr.getBuNo(),
-                            detail.getSupplierNo());
+                            "*");
 
             if (items == null || items.isEmpty()) {
                 continue;
@@ -5521,7 +5521,7 @@ public class QcServiceImpl implements QcService {
         return qcMapper.listByPart(
                 detail.getSite(),
                 detail.getPartNo(),
-                detail.getSupplierNo());
+                "*");
     }
 
     // ================= 查询模板明细 =================

src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml

@@ -182,6 +182,7 @@
         LEFT JOIN part p ON d.part_no = p.part_no AND d.site = p.site
         LEFT JOIN srm_supplier s ON h.supplier_no = s.supplier_no AND h.site = s.site
         <where>
+            AND d.site = #{query.site}
             <if test="query.qcOperator != null and query.qcOperator != ''">
                 AND h.qc_operator = #{query.qcOperator}
             </if>