From 42e68faca0756d44b7c880c9876810ee47d6e92b Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 17 二月 2025 17:57:25 +0800 Subject: [PATCH] 1.DNC模块,设备结构树权限分配优化与修改bug 2.MDC模块,设备编辑车间同步平移设备send目录 3.优化原有指派设备代码 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IAssignFileStreamService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IAssignFileStreamService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IAssignFileStreamService.java index f63b024..5d755fb 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IAssignFileStreamService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IAssignFileStreamService.java @@ -1,6 +1,8 @@ package org.jeecg.modules.activiti.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.activiti.entity.AssignFileStream; import org.jeecg.modules.activiti.ext.ActTaskExt; import org.jeecg.modules.activiti.ext.AssignFileStreamExt; @@ -37,7 +39,7 @@ * 鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟 * @return */ - List<ActTaskExt> getUndoTaskList(); + IPage<ActTaskExt> getUndoTaskList(Integer pageNo, Integer pageSize); /** * 鍏宠仈鐢ㄦ埛琛� 鑾峰彇鐢ㄦ埛鏄电О @@ -75,7 +77,7 @@ * @param size * @return */ - QueryPageResponseResult<AssignFileStreamExt> findPageList(int page, int size, AssignFileStreamQueryRequest request); + Result<?> findPageList(int page, int size, AssignFileStreamQueryRequest request); /** * 鏌ヨ鏂囨。鐨勫鎵硅褰� -- Gitblit v1.9.3