From f04c95c785d72a8236b3bff4436e2981f40b8168 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Dec 2024 16:37:42 +0800 Subject: [PATCH] =?UTF-8?q?44252=20=E4=BA=A7=E7=BA=BF=E5=B1=8F=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E8=BE=B9=E7=AB=AF=EF=BC=8C=E6=97=A0=E9=9C=80=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/controller/base/ExtProdOrgController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8453c29..0ea8f1b 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 @@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -270,9 +271,8 @@ public class ExtProdOrgController extends MesBaseController { @ApiOperation(value = "按条件查询生产线所有数据") public ResultBean queryMesWorkCenterByProperties(MesWorkCenter workCenter) { try { - workCenter.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + if (StringUtils.isEmpty(workCenter.getOrganizeCode())) workCenter.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); List workCenterList = prodOrgService.queryMesWorkCenterByProperties(workCenter); - return ResultBean.success("操作成功").setResultList(workCenterList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) {