qin 1 рік тому
батько
коміт
d451501475

+ 4 - 2
src/main/java/com/poteviohealth/cgp/statistics/service/impl/DistinctionServiceImpl.java

@@ -64,8 +64,10 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
             dto.setOrderId(orderId);
         }else{
             DistinctionDTO dis = baseMapper.checkDis(TokenContext.cureOperatorId(),dbName,uid,count, DateFormatUtils.format(DateUtils.caculDays(new Date(), -day),"yyyy-MM-dd HH:mm:ss"));
-            dto.setOrderId(dis.getOrderId());
-            dto.setRurl(dis.getRurl());
+            if(dis != null){
+                dto.setOrderId(dis.getOrderId());
+                dto.setRurl(dis.getRurl());
+            }
         }
        return dto;
     }