fix-用户禁言
This commit is contained in:
@@ -51,6 +51,6 @@ public class UserExcelController {
|
||||
@RequestMapping(value = "/export/prohibition", method = RequestMethod.GET)
|
||||
public void exportProhibition(@Validated UserBannedPageSearchRequest request, HttpServletResponse response) {
|
||||
List<UserBanned> list = adminUserBannedService.prohibition(request);
|
||||
ExcelUtil.exportExcel(list, "用户举报列表", UserBanned.class, response);
|
||||
ExcelUtil.exportExcel(list, "用户禁言列表", UserBanned.class, response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class AdminUserBannedServiceImpl implements AdminUserBannedService {
|
||||
List<Integer> uidList = dataList.stream().map(UserBanned::getUid).collect(Collectors.toList());
|
||||
Map<Integer, User> userMap = userService.getUidMapList(uidList);
|
||||
for (UserBanned userBanned : dataList) {
|
||||
userBanned.setBannedDay(Optional.ofNullable(userBanned.getBannedTime()).map(endTime -> DateUtil.formatBetween(86400)).orElse("0"));
|
||||
userBanned.setBannedDay(Optional.ofNullable(userBanned.getBannedTime()).map(endTime -> DateUtil.formatBetween(userBanned.getBannedTime() * 1000)).orElse("0"));
|
||||
if (userMap.get(userBanned.getUid()) != null) {
|
||||
userBanned.setUserNickname(userMap.get(userBanned.getUid()).getNickname());
|
||||
userBanned.setPhone(userMap.get(userBanned.getUid()).getPhone());
|
||||
@@ -216,6 +216,7 @@ public class AdminUserBannedServiceImpl implements AdminUserBannedService {
|
||||
userBanned.setUserNickname(userMap.get(userBanned.getUid()).getNickname());
|
||||
userBanned.setPhone(userMap.get(userBanned.getUid()).getPhone());
|
||||
}
|
||||
userBanned.setBannedDay(Optional.ofNullable(userBanned.getBannedTime()).map(endTime -> DateUtil.formatBetween(userBanned.getBannedTime() * 1000)).orElse("0"));
|
||||
}
|
||||
}
|
||||
return dataList;
|
||||
|
||||
Reference in New Issue
Block a user