diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java index 6823100..638f6bb 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java @@ -33,8 +33,7 @@ public class WxNursingLogController extends BaseController { * 查询用户护理记录 */ @GetMapping("/record") - public TableDataInfo record(@NotNull(message = "请选择仪器") - @RequestParam(value = "instrumentId", required = false) Long instrumentId) { + public TableDataInfo record(@RequestParam(value = "instrumentId", required = false) Long instrumentId) { startPage(); List list = wxNursingLogService.selectWxNursingLogList(instrumentId); return getDataTable(list); @@ -44,7 +43,7 @@ public class WxNursingLogController extends BaseController { * 查询用户护理记录的当月统计信息 */ @GetMapping("/statistics") - public R statistics(@NotNull(message = "请选择仪器") @RequestParam(value = "instrumentId") Long instrumentId) { + public R statistics(@RequestParam(value = "instrumentId") Long instrumentId) { return R.ok(wxNursingLogService.statistics(instrumentId)); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index 5a94c35..f851140 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -81,7 +81,10 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { public List selectWxNursingLogList(Long instrumentId) { // 排序:最新的护理记录在最上方;图片由后台模式管理-模式封面图片进行配置; WxNursingLog wxNursingLog = new WxNursingLog(); - wxNursingLog.setInstrumentId(instrumentId); + if (instrumentId != null) { + wxNursingLog.setInstrumentId(instrumentId); + } + wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(wxNursingLog); if (wxNursingLogList != null && wxNursingLogList.size() > 0) { for (WxNursingLog nursingLog : wxNursingLogList) {