소스 검색

fixed: 管家完成任务后描述与图片

orgycat 3 년 전
부모
커밋
6238e7098e
1개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      src/main/java/com/care/common/service/impl/CareEventOrderChambServiceImpl.java

+ 4 - 1
src/main/java/com/care/common/service/impl/CareEventOrderChambServiceImpl.java

@@ -103,8 +103,11 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     @Override
     public ChambEventOrderVO getChambOrderByOrderIdAndChambId(Long orderId, Long chambId) {
         QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrderChamb::getOrderId,orderId).eq(CareEventOrderChamb::getChambId, chambId);
+        queryWrapper.lambda().eq(CareEventOrderChamb::getOrderId,orderId).eq(CareEventOrderChamb::getId, chambId);
         CareEventOrderChamb order = this.getOne(queryWrapper);
+        if (order == null) {
+            return null;
+        }
         ChambEventOrderVO vo = new ChambEventOrderVO();
         BeanUtil.copyProperties(order, vo);
         return vo;