From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期六, 04 十一月 2023 15:43:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java index d0cb7ee..c975486 100644 --- a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java +++ b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java @@ -99,7 +99,7 @@ return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "鏈煡璇㈠埌姝id鐨勯厤缃俊鎭紝璇疯仈绯荤鐞嗗憳锛�", req); } List<Depot> depotList = threeMapper.getDepotList(req.getCompanyId(), req.getDeptId(), threeConf.getDepotId()); - if(list.size() > 0){ + if(null != depotList && depotList.size() > 0){ data1001 = new Data1001(); data1001.setUid(threeConf.getUid()); data1001.setDepotName(depotList.get(0).getName()); -- Gitblit v1.9.3