From 1d84a3c62eeee429f7d7d6339bcf9b504a9d7277 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 16:01:33 +0800
Subject: [PATCH] DNC流程配置、DNC部门处理
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
index 18c2067..61d343c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
@@ -16,6 +16,7 @@
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.activiti.entity.AssignFileStream;
import org.jeecg.modules.activiti.entity.ToEquipmentTask;
@@ -512,7 +513,7 @@
@Override
public List<ActTaskExt> getUndoTaskList() {
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
return null;
@@ -693,7 +694,7 @@
}
@Override
- public QueryPageResponseResult<AssignFileStreamExt> findPageList(int page, int size, AssignFileStreamQueryRequest request) {
+ public Result<?> findPageList(int page, int size, AssignFileStreamQueryRequest request) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -716,7 +717,7 @@
}
}
IPage<AssignFileStreamExt> streamExtIPage = super.getBaseMapper().findByPage(pageData, lambdaQueryWrapper);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, streamExtIPage);
+ return Result.ok(streamExtIPage);
}
@Override
--
Gitblit v1.9.3