From 3fa56d2c6151921ef786fa66f651a2ff5d9423d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 十一月 2025 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
index 8acbaa5..c819db4 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -292,7 +292,7 @@
List<TCompany> companies = baseMapper.selectList(new EntityWrapper<TCompany>().eq("type", 2));
// 获取所有未分账的信息
- List<Income> state = incomeService.selectList(new EntityWrapper<Income>().eq("state", 0));
+ List<Income> state = incomeService.selectList(new EntityWrapper<Income>().eq("state", 0).eq("category",1));
for (TCompany company : companies) {
Integer paymentDays = company.getPaymentDays();
LocalDate localDate = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
--
Gitblit v1.7.1