From 61ce1398146e56d970de4566d48a8ae942204649 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Mon, 5 Aug 2024 20:15:51 +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

---
 .../item/service/impl/ItemServiceImpl.java        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 3266913fa..992871bd9 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
@@ -6352,7 +6352,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     @Override
     public PageData<ItemHotlineEntity> getHotLineFromList(Map<String, Object> params){
-        try {
+//        try {
             UserDetail userDetail = SecurityUser.getUser();
             Long deptId = userDetail.getDeptId();
 
@@ -6365,18 +6365,19 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }else{
                 lambdaQueryWrapper.eq(ItemHotlineEntity::getStreetId,deptId);
             }
-
+            // 过滤掉退件的
+            lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag));
             lambdaQueryWrapper
                     .groupBy(ItemHotlineEntity::getSqid);
-
+            lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj);
             IPage<ItemHotlineEntity> page = getPage(params);
             IPage<ItemHotlineEntity> itemHotlineEntityIPage = itemHotlineDao.selectPage(page, lambdaQueryWrapper);
             return new PageData<>(itemHotlineEntityIPage.getRecords(), itemHotlineEntityIPage.getTotal());
 
-        }catch (Exception e){
-
-        }
-        return new PageData<>(null, 0);
+//        }catch (Exception e){
+//
+//        }
+//        return new PageData<>(null, 0);
     }
 
     @Override