From 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:57:28 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java
index 9135228..8b58fd5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java
@@ -1,13 +1,15 @@
package org.jeecg.modules.dnc.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.dnc.dto.ComponentExt;
import org.jeecg.modules.dnc.entity.ComponentInfo;
+import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.PermissionStream;
-import org.jeecg.modules.dnc.ucenter.Department;
+import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
-import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
@@ -144,6 +146,33 @@
* @return
*/
List<ComponentInfo> getByParentIdAndUserId(String parentId, String userId);
+
+ /**
+ * 閫氳繃闆朵欢鍙枫�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘
+ * @param treeInfoRequest
+ * @return
+ */
+ List<DocInfo> getByComponentInfo(TreeInfoRequest treeInfoRequest);
+
+ /**
+ * 鏌ヨ鍙互琚紩鐢ㄧ殑閮ㄤ欢
+ * @param componentInfo
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ IPage<ComponentInfo> getByComponentId(ComponentInfo componentInfo, Integer pageNo, Integer pageSize);
+
+ /**
+ * 鍊熺敤閮ㄤ欢(鍙壒閲�) - 鍘熸湁閮ㄤ欢id锛屾柊閮ㄤ欢ids
+ * @param oldId,newIds
+ * @return
+ */
+ Result<?> borrowComponent(String oldId, String newIds);
+
+ boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd);
+
+ boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd);
}
--
Gitblit v1.9.3