From 23adbd6fd679e293c4c8118713b9e1e8b0a463bb Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期三, 17 七月 2024 16:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index c09609b..6b54651 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -102,6 +102,9 @@
ids.clear();
ids.add(userMapper.selectOne(Wrappers.<User>lambdaQuery().like(User::getName, name)).getId());
}
+ if (ids.size()==0){
+ ids=null;
+ }
IPage<AuxiliaryOriginalHoursDto> originalHoursDtoIPage = new Page<>();
originalHoursDtoIPage.setSize(page.getSize());
originalHoursDtoIPage.setCurrent(page.getCurrent());
@@ -130,7 +133,7 @@
auxiliaryOriginalHoursDtos.add(getData(objectMap, "鎬诲伐鏃�"));
}
}
- //濡傛灉浜ч噺宸ユ椂涓虹┖
+ //濡傛灉杓斿姪宸ユ椂涓嶄负绌�
else if (ObjectUtils.isNotEmpty(maps1)) {
for (Map<String, Object> objectMap : maps1) {
auxiliaryOriginalHoursDtos.add(getData(objectMap, "鎬诲伐鏃�"));
--
Gitblit v1.9.3