|
@@ -393,9 +393,13 @@ public class WmPayOffController {
|
|
|
output.setUsername(sysUser.getUsername());
|
|
|
output.setRealname(sysUser.getRealname());
|
|
|
output.setSettleStatus(settleNote.getSettleNoteStatus());
|
|
|
- output.setSettleStatusName(SettleStatusEnum.resolve(String.valueOf(settleNote.getSettleNoteStatus())).getName2());
|
|
|
+ if (settleNote.getSettleNoteStatus() != null) {
|
|
|
+ output.setSettleStatusName(SettleStatusEnum.resolve(String.valueOf(settleNote.getSettleNoteStatus())).getName2());
|
|
|
+ }
|
|
|
output.setSubjectLocation(settleNote.getSubjectLocation());
|
|
|
- output.setSubjectLocationName(settleNote.getSubjectLocation().getDescription());
|
|
|
+ if (settleNote.getSubjectLocation() != null) {
|
|
|
+ output.setSubjectLocationName(settleNote.getSubjectLocation().getDescription());
|
|
|
+ }
|
|
|
output.setReviewStatus(settleNote.getReviewStatus());
|
|
|
outputList.add(output);
|
|
|
});
|