From 8d63dd77b9b3cd9b6d9768f216670fc499a8cab3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 23 一月 2025 14:32:16 +0800
Subject: [PATCH] 整合DNC 权限分配 修改为设备车间管理权限
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index f5b9fec..7db259e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -749,7 +749,7 @@
}
@Override
- public QueryPageResponseResult<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
+ public IPage<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -786,11 +786,11 @@
d.setSyncStatus(2);
}
}
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
+ return docInfoIPage;
}
@Override
- public QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery) {
+ public List<DocInfo> findList(DocInfoQueryRequest docQuery) {
if(docQuery == null || !ValidateUtil.validateString(docQuery.getAttributionId())
|| !ValidateUtil.validateInteger(docQuery.getAttributionType()) ||
!ValidateUtil.validateString(docQuery.getDocClassCode())) {
@@ -816,8 +816,8 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
- List<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(queryWrapper);
- return new QueryListResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
+ queryWrapper.orderByDesc("u.create_time");
+ return super.getBaseMapper().findDocExtList(queryWrapper);
}
@Override
--
Gitblit v1.9.3