123456
2024-07-17 23adbd6fd679e293c4c8118713b9e1e8b0a463bb
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, "总工时"));