日睡眠图表

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java

@@ -126,7 +126,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
             vo.setSleepAt(e.getStartSleep());
             vo.setSleepAt(e.getStartSleep());
             vo.setWakeUpAt(e.getEndSleep());
             vo.setWakeUpAt(e.getEndSleep());
 
 
-            List<PlatElderSleepDiagramContentVO> contentList = StreamUtil.map(e.getSleepRecord(), i -> {
+            List<PlatElderSleepDiagramContentVO> contentList = StreamUtil.map(Optional.ofNullable(e.getSleepRecord()).orElse(new ArrayList<>(10)), i -> {
                 PlatElderSleepDiagramContentVO contentVO = new PlatElderSleepDiagramContentVO();
                 PlatElderSleepDiagramContentVO contentVO = new PlatElderSleepDiagramContentVO();
 
 
                 contentVO.setStartTime(i.getStartTime());
                 contentVO.setStartTime(i.getStartTime());

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java

@@ -5,6 +5,7 @@ import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
 import com.makeit.enums.Const;
 import com.makeit.enums.Const;
 import com.makeit.enums.HeaderConst;
 import com.makeit.enums.HeaderConst;
+import com.makeit.global.aspect.misc.nofill.NoFillUtil;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
@@ -55,6 +56,8 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
             childrenInfo.setStreetOrgId(vo.getStreetOrgId());
             childrenInfo.setStreetOrgId(vo.getStreetOrgId());
             childrenInfo.setOrgPath(vo.getOrgPath());
             childrenInfo.setOrgPath(vo.getOrgPath());
 
 
+            childrenInfo.setCreateBy(userInfo.getNickName());
+
         }
         }
 
 
         childrenInfo.setPhone(userInfo.getPhoneNumber());
         childrenInfo.setPhone(userInfo.getPhoneNumber());
@@ -64,7 +67,13 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
 
 
         //RequestUtil.setHeader(HeaderConst.WECHAT_TOKEN, token);
         //RequestUtil.setHeader(HeaderConst.WECHAT_TOKEN, token);
 
 
-        platElderChildrenInfoService.saveOrUpdate(childrenInfo);
+        childrenInfo.setUpdateBy(userInfo.getNickName());
+        PlatElderChildrenInfo finalChildrenInfo = childrenInfo;
+        NoFillUtil.executeCreate(()->{
+            NoFillUtil.executeUpdate(()->{
+                platElderChildrenInfoService.saveOrUpdate(finalChildrenInfo);
+            });
+        });
 
 
         WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class);
         WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class);