Эх сурвалжийг харах

fix: 财务复核功能-查询NPE

lixuesong 1 жил өмнө
parent
commit
8f6cc2fe93

+ 6 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -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);
 		});