修改

lyh

2025-07-08 d4c5f8e7bf9b2bb48922396d1be5b2f274d8effb

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java

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

import java.util.Arrays;
import java.util.List;
@@ -7,10 +7,10 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
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.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.service.IBaseFactoryService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,10 +83,10 @@
    @AutoLog(value = "产线表-查询树形结构所有产线名称")
    @ApiOperation(value = "产线表-查询树形结构所有产线名称", notes = "产线表-查询树形结构所有产线名称")
    @GetMapping(value = "/queryIdTree")
    public Result<List<WorkShopIdModel>> queryIdTree() {
       Result<List<WorkShopIdModel>> result = new Result<>();
    public Result<List<EamBaseFactoryIdModel>> queryIdTree() {
       Result<List<EamBaseFactoryIdModel>> result = new Result<>();
       try {
          List<WorkShopIdModel> list = BaseFactoryService.queryProductionIdTreeList();
          List<EamBaseFactoryIdModel> list = BaseFactoryService.queryProductionIdTreeList();
          result.setResult(list);
          result.setSuccess(true);
       } catch (Exception e) {