Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -67,7 +67,10 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
 //        setTenantId(bizTechnologicalProcessDetailDrawing);
 //        startPage();
         List<BizDeptProcess> bizDeptProcesses = bizDeptProcessService.query().eq("dept_id", bizTechnologicalProcessDetailDrawing.getDeptId()).list();
-        List<BizTechnologicalProcessDetail> technologicalProcessDetails = iBizTechnologicalProcessDetailService.query().eq("product_id", bizTechnologicalProcessDetailDrawing.getProductId()).eq("technology_version", bizTechnologicalProcessDetailDrawing.getProductVersion()).list();
+        List<BizTechnologicalProcessDetail> technologicalProcessDetails = iBizTechnologicalProcessDetailService.query()
+                .eq("product_id", bizTechnologicalProcessDetailDrawing.getProductId())
+                .eq("technology_version", bizTechnologicalProcessDetailDrawing.getProductVersion())
+                .eq("technological_process_id", bizTechnologicalProcessDetailDrawing.getTechnologicalProcessId()).list();
 //        bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
 //        List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);