From fbe083be2e6b08273c430b5cc429cb60fd3390d1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 14 Oct 2022 14:40:52 +0800 Subject: [PATCH] =?UTF-8?q?handledeptid=E5=8F=AF=E8=83=BD=E6=98=AF?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../modules/item/service/impl/ItemServiceImpl.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index db4782f75..0684de84e 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit db4782f7593219f93de4555b09bfc59a86b7d36f +Subproject commit 0684de84eb7aeec1f3d6b9cbd53b7fd104f27242 diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 8cd538d06..7a119df08 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 8cd538d06bde3502713af17ba3b645eb944180ec +Subproject commit 7a119df0841805e0a139b7416a2ee314ca371320 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index fd922b718..548231663 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -768,7 +768,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 处理详情获取存在多条1065的作物数据情况 Long handlerDeptId; - if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) { + if (null == resultDTO.getHandlerDeptId() || 0L == resultDTO.getHandlerDeptId()) { ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id); handlerDeptId = byItemId.getHandlerDeptId(); } else { @@ -963,7 +963,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 处理详情获取存在多条1065的作物数据情况 Long handlerDeptId; - if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) { + if (null == resultDTO.getHandlerDeptId() || 0L == resultDTO.getHandlerDeptId()) { ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id); handlerDeptId = byItemId.getHandlerDeptId(); } else { @@ -4005,17 +4005,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem List updateList = new ArrayList(); String returnMsgBody = ""; List itemList = formDto.getItemList(); - for(int i = 0 ; i < itemList.size() ; i++){ + for (int i = 0; i < itemList.size(); i++) { AcceptItemDifficultyFormDTO acceptItemDifficultyFormDTO = itemList.get(i); - if("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())){ + if ("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())) { updateList.add(acceptItemDifficultyFormDTO.getSerialNum()); } } - if(updateList.size() > 0){ + if (updateList.size() > 0) { try { baseDao.updateBatchBySerialNum(updateList); - }catch (Exception e){ + } catch (Exception e) { // 保存接口调用日志 this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), ApiConstants.acceptItemDifficulty, YesOrNoEnum.NO.value(), formDto.toString(), returnMsgBody);