From d779d60ad6c4cbb96372f7d69352d778c0e08dc2 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 23 Aug 2024 14:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/service/impl/ItemHotlineServiceImpl.java    | 3 ++-
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
index 130251e2a..75fa7bd4d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
@@ -309,7 +309,8 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
 
     @Override
     public void goBack(ItemHotlineDTO dto) {
-        ItemHotlineEntity entity = ConvertUtils.sourceToTarget(dto, ItemHotlineEntity.class);
+        ItemHotlineEntity itemHotlineEntity = baseDao.selectById(dto.getId());
+        ItemHotlineEntity entity = ConvertUtils.sourceToTarget(itemHotlineEntity, ItemHotlineEntity.class);
         entity.setBackItemFlag("1");
         entity.setBackItemResult(dto.getBackItemResult());
         updateById(entity);
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 8a7a8c6db..057cc2605 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
@@ -6387,6 +6387,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         String cbFlag = (String) params.get("cbFlag");
         if(StringUtils.isNotBlank(cbFlag)){
             lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag"));
+        }else {
+            lambdaQueryWrapper.isNull(ItemHotlineEntity::getCbFlag);
         }
 
 //            lambdaQueryWrapper