Merge remote-tracking branch 'origin/dev' into dev

server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

@@ -35,7 +35,6 @@ public class PlatAlarmRecordChildrenController {
     @ApiOperation("列表")
     @ApiOperation("列表")
     @PostMapping("page")
     @PostMapping("page")
     @TenantIdIgnore
     @TenantIdIgnore
-    @AuthIgnore
     public ApiResponseEntity<Map<String, Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public ApiResponseEntity<Map<String, Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
         //只能看到发给关联的长者告警
         //只能看到发给关联的长者告警
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
      */
      */
     @Override
     @Override
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
-        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(1734851178514202626L);
+        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
         List<PlatElderChildrenInfo> platElderChildrenInfoList = getPlatElderChildrenInfosByOpenid(platElderChildrenInfo.getOpenid());
         List<PlatElderChildrenInfo> platElderChildrenInfoList = getPlatElderChildrenInfosByOpenid(platElderChildrenInfo.getOpenid());
         log.info("子女端账号：{}",JSON.toJSONString(platElderChildrenInfo));
         log.info("子女端账号：{}",JSON.toJSONString(platElderChildrenInfo));
         if(CollectionUtils.isEmpty(platElderChildrenInfoList)){
         if(CollectionUtils.isEmpty(platElderChildrenInfoList)){