Browse Source

棒一工作台增加对应判空处理

lingpeng.li 3 weeks ago
parent
commit
38fe2e7d69

+ 6 - 1
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -360,11 +360,16 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
                     // 这里用优先级取 createTime
                     Date finalCreateTime = null;
-                    if (rollOne != null && rollOne.getRollSendDetails() != null && rollOne.getRollSendDetails().get(0).getCreateTime() != null) {
+                    if (rollOne != null
+                            && rollOne.getRollSendDetails() != null
+                            && !rollOne.getRollSendDetails().isEmpty()
+                            && rollOne.getRollSendDetails().get(0).getCreateTime() != null) {
+
                         finalCreateTime = rollOne.getRollSendDetails().get(0).getCreateTime();
                     } else {
                         finalCreateTime = latest.getCreateTime();
                     }
+
                     detail.setCreateTime(finalCreateTime);
 
                     detail.setHeatNoAmount(totalAmount);