Merge remote-tracking branch 'origin/master'

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

@@ -53,15 +53,16 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
         return success(list);
     }
-//    @GetMapping("/list")
-    public AjaxResult listNew(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
+    @GetMapping("/listProcess")
+    public AjaxResult listProcess(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
 //        setTenantId(bizTechnologicalProcessDetailDrawing);
 //        startPage();
         List<BizDeptProcess> bizDeptProcesses = bizDeptProcessService.query().eq("dept_id", bizTechnologicalProcessDetailDrawing.getDeptId()).list();
         bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
         List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
-        return success(list);
+
+        return success(bizDeptProcesses.stream().filter(v -> list.stream().anyMatch(t -> t.getProcessCode().equals(v.getProcessCode()))).collect(Collectors.toList()));
     }
     /**
      * 查询电子图纸列表