修改

lyh

2025-07-08 d4c5f8e7bf9b2bb48922396d1be5b2f274d8effb

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.base.util;
package org.jeecg.modules.system.util;

import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.eam.base.model.WorkShopIdModel;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;

import java.util.ArrayList;
import java.util.List;
@@ -22,7 +22,7 @@
     * è¯¥æ–¹æ³•æ˜¯s将BaseFactory类型的list集合转换成EamBaseFactoryTreeModel类型的集合
     */
    public static List<EamBaseFactoryTreeModel> wrapTreeDataToTreeList(List<BaseFactory> recordList) {
        List<WorkShopIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryTreeModel> records = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            BaseFactory BaseFactory = recordList.get(i);
@@ -40,17 +40,17 @@
     * queryTreeList的子方法 ====1=====
     * è¯¥æ–¹æ³•æ˜¯æ‰¾åˆ°å¹¶å°è£…顶级父类的节点到TreeList集合
     */
    public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> workShopIdModelList) {
    public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> EamBaseFactoryIdModelList) {
        List<EamBaseFactoryTreeModel> treeList = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            EamBaseFactoryTreeModel branch = recordList.get(i);
            if (oConvertUtils.isEmpty(branch.getParentId())) {
                treeList.add(branch);
                WorkShopIdModel WorkShopIdModel = new WorkShopIdModel().convert(branch);
                workShopIdModelList.add(WorkShopIdModel);
                EamBaseFactoryIdModel EamBaseFactoryIdModel = new EamBaseFactoryIdModel().convert(branch);
                EamBaseFactoryIdModelList.add(EamBaseFactoryIdModel);
            }
        }
        getGrandChildren(treeList, recordList, workShopIdModelList);
        getGrandChildren(treeList, recordList, EamBaseFactoryIdModelList);
        return treeList;
    }

@@ -58,15 +58,15 @@
     * queryTreeList的子方法====3====
     *该方法是找到顶级父类下的所有子节点集合并封装到TreeList集合
     */
    private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> idList) {
    private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> idList) {
        for (int i = 0; i < treeList.size(); i++) {
            EamBaseFactoryTreeModel model = treeList.get(i);
            WorkShopIdModel idModel = idList.get(i);
            EamBaseFactoryIdModel idModel = idList.get(i);
            for (int i1 = 0; i1 < recordList.size(); i1++) {
                EamBaseFactoryTreeModel m = recordList.get(i1);
                if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
                    model.getChildren().add(m);
                    WorkShopIdModel pim = new WorkShopIdModel().convert(m);
                    EamBaseFactoryIdModel pim = new EamBaseFactoryIdModel().convert(m);
                    idModel.setSelectable(false);
                    idModel.getChildren().add(pim);
                }
@@ -95,8 +95,8 @@
    /**
     * èŽ·å– DepartIdModel
     */
    public static List<WorkShopIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
        List<WorkShopIdModel> idList = new ArrayList<>();
    public static List<EamBaseFactoryIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
        List<EamBaseFactoryIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryTreeModel> records = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            BaseFactory BaseFactory = recordList.get(i);