解决冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -218,6 +218,7 @@ public class CheckServiceImpl implements ICheckService {
             return new PageImpl<>(content, param, total);
         }
         content = checkMapper.getCheckInfoNew(param);
+
         if (!CollectionUtils.isEmpty(content)) {
             Set<String> userIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getUserId));
             Set<String> deptIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getDepId));
@@ -245,6 +246,7 @@ public class CheckServiceImpl implements ICheckService {
                 e.setUserName(Joiner.on(",").join(userNames));
             });
         }
+
         return new PageImpl<>(content, param, total);
     }