Browse Source

修复-项目概览无项目成员且未有人填写日报情况下返回了所有人0工时数据

fuyuchuan 4 months ago
parent
commit
5e70faad52

+ 5 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmProjectServiceImpl.java

@@ -641,6 +641,11 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         }
 
         List<Long> userIds1 = new ArrayList<>(userIds);
+
+        if (userIds1.isEmpty()){
+            return workTimeCount;
+        }
+
         List<SysUser> sysUsers = pmWorkContentService.nickNames(userIds1);
         BigDecimal totalWorkTime = BigDecimal.ZERO;
 

+ 3 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -428,7 +428,9 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
     @Override
     public List<SysUser> nickNames(List<Long> userIds) {
         LambdaQueryWrapper<SysUser> usersQuery = Wrappers.lambdaQuery();
-        usersQuery.select(SysUser::getUserId, SysUser::getNickName, SysUser::getUserName, SysUser::getPhonenumber, SysUser::getAvatar, SysUser::getSex, SysUser::getDeptId).eq(SysUser::getTenantId, SecurityUtils.getTenantId()).eq(SysUser::getDelFlag, 0);
+        usersQuery.select(SysUser::getUserId, SysUser::getNickName, SysUser::getUserName, SysUser::getPhonenumber, SysUser::getAvatar, SysUser::getSex, SysUser::getDeptId)
+                .eq(SysUser::getTenantId, SecurityUtils.getTenantId())
+                .eq(SysUser::getDelFlag, 0);
         if (!userIds.isEmpty()) {
             usersQuery.in(SysUser::getUserId, userIds);
         }