From cab4955059d77df3f0439e1da8662ef08476262b Mon Sep 17 00:00:00 2001
From: mx <1@qq.com>
Date: Fri, 7 Feb 2025 09:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=9C=8D=E5=8A=A1=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=A1=A3=E6=A1=88=E7=89=B9=E6=AE=8A=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/PsCompanyInfoServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
index b27b0d1..5542c32 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
@@ -191,7 +191,11 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
             sql.append("and business_type = '2' and is_proxy = '2'");
         }
         lqw.exists(bo.getType() != 1, sql.toString());
-        lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
+
+        //2025/02/07 财务需求 新完成任务的公司排在最上边。这里专门针对宋姐的号 做特殊排序处理
+        if (!Objects.equals(100L, LoginHelper.getUserId())){
+            lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
+        }
         lqw.orderByDesc("finish_date");
         lqw.eq("com.del_flag", 0);
 //        lqw.groupBy("com.id");