|
@@ -51,16 +51,18 @@ public class CheckRecordServiceImpl implements ICheckRecordService {
|
|
|
*/
|
|
|
@Override
|
|
|
public CheckRecord selectCheckRecordByCrId(Long crId) {
|
|
|
- CheckRecord cr;
|
|
|
+ CheckRecord cr=new CheckRecord();
|
|
|
if (crId == 0L) {
|
|
|
cr = checkRecordMapper.selectCheckRecordByLast();
|
|
|
} else {
|
|
|
cr = checkRecordMapper.selectCheckRecordByCrId(crId);
|
|
|
}
|
|
|
- CheckRecordDetail crd = new CheckRecordDetail();
|
|
|
- crd.setCrId(cr.getCrId());
|
|
|
- List<CheckRecordDetail> list = crdMapper.selectCheckRecordDetailList(crd);
|
|
|
- cr.setDetailList(list);
|
|
|
+ if (cr != null) {
|
|
|
+ CheckRecordDetail crd = new CheckRecordDetail();
|
|
|
+ crd.setCrId(cr.getCrId());
|
|
|
+ List<CheckRecordDetail> list = crdMapper.selectCheckRecordDetailList(crd);
|
|
|
+ cr.setDetailList(list);
|
|
|
+ }
|
|
|
return cr;
|
|
|
}
|
|
|
|