From ca6fade1a01de3b64a12d998a791cec1b2b8fe1a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 18 十月 2024 10:34:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
index ad0bc26..472d616 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
@@ -40,17 +40,17 @@
List<TAccountingStrategyVO> list = this.baseMapper.pageList(query,pageInfo);
List<Integer> parentIds = list.stream().map(TAccountingStrategyVO::getId).collect(Collectors.toList());
List<TAccountingStrategy> list1 = this.list(Wrappers.lambdaQuery(TAccountingStrategy.class)
- .in(TAccountingStrategy::getParentId, parentIds)
+ .in(!parentIds.isEmpty(),TAccountingStrategy::getParentId, parentIds)
.in(TAccountingStrategy::getAuditStatus, Arrays.asList(1,2)));
for (TAccountingStrategyVO tAccountingStrategyVO : list) {
SysUser data = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();
tAccountingStrategyVO.setUserName(data.getNickName());
if (tAccountingStrategyVO.getFirstUserId()!=null){
- SysUser first = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();
+ SysUser first = sysUserClient.getSysUser(tAccountingStrategyVO.getFirstUserId()).getData();
tAccountingStrategyVO.setFirstUserName(first==null?null:first.getNickName());
}
if (tAccountingStrategyVO.getTwoUserId()!=null){
- SysUser two = sysUserClient.getSysUser(tAccountingStrategyVO.getUserId()).getData();
+ SysUser two = sysUserClient.getSysUser(tAccountingStrategyVO.getTwoUserId()).getData();
tAccountingStrategyVO.setTwoUserName(two==null?null:two.getNickName());
}
// 匹配编辑后的未审核的
--
Gitblit v1.7.1