指令

device-api-service/src/main/java/com/xy/service/DeviceCreateIdsServiceImpl.java

@@ -106,19 +106,20 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
                 .build()
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceCreateIds::getCreateTime);
         IPage<DeviceCreateIds> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
-        IPage<DeviceCreateIdsDto.Vo> voIPage = PlusBeans.copy(DeviceCreateIdsDto.Vo.class, iPage);
-        PageBean<DeviceCreateIdsDto.Vo> voPageBean = toPageBean(voIPage);
+        PageBean<DeviceCreateIdsDto.Vo> voPageBean = toPageBean(PlusBeans.copy(DeviceCreateIdsDto.Vo.class, iPage));
         List<DeviceCreateIdsDto.Vo> records = voPageBean.getRecords();
         JList<Long> createUserIds = new JArrayList<>(records).getProperty(DeviceCreateIdsDto.Vo::getCreateUserId);
         List<SysWorkVo> sysWorkVos = sysWorkUserService.list(new ListDto().setId(createUserIds)).getData();
-        JMap<Long, SysWorkVo> sysWorkVoJMap = new JArrayList<>(sysWorkVos).toMap(SysWorkVo::getId).cover();
-        records.forEach(vo -> {
-            SysWorkVo sysWorkVo = sysWorkVoJMap.get(vo.getCreateUserId());
-            if (sysWorkVo == null) {
-                return;
-            }
-            vo.setCreateUserName(sysWorkVo.getAccount());
-        });
+        if (Emptys.check(sysWorkVos)) {
+            JMap<Long, SysWorkVo> sysWorkVoJMap = new JArrayList<>(sysWorkVos).toMap(SysWorkVo::getId).cover();
+            records.forEach(vo -> {
+                SysWorkVo sysWorkVo = sysWorkVoJMap.get(vo.getCreateUserId());
+                if (sysWorkVo == null) {
+                    return;
+                }
+                vo.setCreateUserName(sysWorkVo.getAccount());
+            });
+        }
         return R.ok(voPageBean);
     }