From d5aef2e06c79541ed003af44e621df7c57fcf2e7 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 29 Jan 2024 16:02:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
index 53390da..ccdf985 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
@@ -14,6 +14,8 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -35,7 +37,9 @@
*/
@ApiOperation(value = "数据规则校验-分页列表查询", notes = "数据规则校验-分页列表查询")
@GetMapping(value = "/list")
- public R<IPage<QualityManageVO>> queryPageList(QualityManageVO qualityManageVO, Query query) {
+ public R<IPage<QualityManageVO>> queryPageList(Query query,QualityManageVO qualityManageVO) {
+
+
IPage<QualityManageVO> pageList = qualityManageService.selectCustomizePage(Condition.getPage(query), qualityManageVO);
return R.data(pageList);
}
--
Gitblit v1.9.3