|
@@ -107,21 +107,11 @@ public class IotStaticController {
|
|
|
|
|
|
@GetMapping("/notice")
|
|
|
@PermitAll
|
|
|
- public CommonResult<PageResult<OrderVo>> getNotice(@Valid @RequestBody OrderVo pageReqVO) {
|
|
|
+ public CommonResult<PageResult<OrderVo>> getNotice(@Valid OrderVo pageReqVO) {
|
|
|
PageResult<OrderVo> notice = iotMaintainService.getNotice(pageReqVO);
|
|
|
if (CollUtil.isEmpty(notice.getList())) {
|
|
|
return success(new PageResult<>(notice.getTotal()));
|
|
|
}
|
|
|
-// notice.getList().forEach(orderVo -> {
|
|
|
-// if ("维修工单".equals(orderVo.getType())||"保养工单".equals(orderVo.getType())) {
|
|
|
-// if (Objects.nonNull(orderVo.getPerson())) {
|
|
|
-// AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(orderVo.getPerson()));
|
|
|
-// if (Objects.nonNull(user)) {
|
|
|
-// orderVo.setPerson(user.getNickname());
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// });
|
|
|
return success(notice);
|
|
|
}
|
|
|
|