From a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 15:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/investigate/Investigate.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index 1bd6a98..5723ded 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -126,21 +126,27 @@
user.setExaminationType("1");
for (int i = 0; i < res.length(); i++) {
if (res.getJSONObject(i).get("zdrylbjh").toString() != null
- && res.getJSONObject(i).get("zdrylbjh").toString() != "") {
+ && res.getJSONObject(i).get("zdrylbjh").toString() != ""
+ && res.getJSONObject(i).get("zdrylbjh").toString() != "null"
+ ) {
user.setExaminationMx(res.getJSONObject(i).get("zdrylbjh").toString());
//更新用户数据
userService.updateById(user);
break;
}
if (res.getJSONObject(i).get("zdryxlmc").toString() != null
- && res.getJSONObject(i).get("zdryxlmc").toString() != "") {
+ && res.getJSONObject(i).get("zdryxlmc").toString() != ""
+ && res.getJSONObject(i).get("zdryxlmc").toString() != "null"
+ ) {
user.setExaminationMx(res.getJSONObject(i).get("zdryxlmc").toString());
//更新用户数据
userService.updateById(user);
break;
}
if (res.getJSONObject(i).get("ztrylx").toString() != null
- && res.getJSONObject(i).get("ztrylx").toString() != "") {
+ && res.getJSONObject(i).get("ztrylx").toString() != ""
+ && res.getJSONObject(i).get("ztrylx").toString() != "null"
+ ) {
user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
//更新用户数据
userService.updateById(user);
--
Gitblit v1.9.3