From af3b07fcf618026bd29c397a3fce66d908511325 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 13 九月 2023 11:50:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 0507011..646d483 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -32,6 +32,12 @@
private IDockingLogeService dockingLogeService;
/***
+ * 闆嗘垚浠诲姟鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingTaskService dockingTaskService;
+
+ /***
* 闆嗘垚鎺ュ彛澶村崗璁湇鍔�
*/
@Autowired( required = false)
@@ -54,8 +60,7 @@
*/
@Override
public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
- IPage<DockingTask> pages=null;
-// IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+ IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
return DockingTaskWrapper.build().pageVO(pages);
}
--
Gitblit v1.9.3