From 035c67e5712a0968065e5ed2d774d2c93dfd7938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Thu, 30 May 2024 13:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/ext/mes/apiservice/controller/base/BaseMesController.java   | 2 +-
 .../ext/mes/apiservice/controller/base/ExtProdOrgController.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
index 7bb3b8f..17e38f1 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
@@ -152,7 +152,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
     @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
     public ResultBean<T> queryByPager(T bean, Pager pager) {
         try {
-            bean.setOrganizeCode("CK01");
+            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
             ListPager<T> listPager = getBaseService().queryPager(bean, pager);
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java
index 5bed39e..06536f0 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService;
 import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService;
 import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService;
 import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords;
@@ -82,7 +83,7 @@ public class ExtProdOrgController extends MesBaseController {
 
             ListPager listPager = null;
 
-            ProdOrgExtModel.setOrganizeCode("CK01");
+            ProdOrgExtModel.setOrganizeCode(AuthUtilExt.getOrganizeCode());
             //工厂
             if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_ONE.getValue() == ProdOrgExtModel.getLevel()) {