From 6038dbee0781f023397d36c3f27d92a0ac9b8bc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:41:19 +0800
Subject: [PATCH] 审查接口修改,装备字段新增,指令查询接口修改

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 72da4bb..45e3873 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -155,15 +155,20 @@
 		Object data1 = jsonObject.get("data");
 		JSONObject jsonObject1 = JSONObject.parseObject(data1.toString());
 		List<Map<String,Object>> res = (List<Map<String,Object>>)jsonObject1.get("res");
-		int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
-		res.forEach(map -> {
-			if (null!=map.get("zdxsfzqkry")){
-				user.setExaminationMx(map.get("zdxsfzqkry").toString());
+		if(res.size()>0) {
+			int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
+			res.forEach(map -> {
+				if (null != map.get("zdxsfzqkry")) {
+					user.setExaminationMx(map.get("zdxsfzqkry").toString());
+				}
+			});
+			if (count > 0) {
+				user.setExaminationType("1");
+			} else {
+				user.setExaminationType("0");
 			}
-		});
-		if (count>0){
-			user.setExaminationType("1");
 		}else {
+			//没有数据正常
 			user.setExaminationType("0");
 		}
 		return R.status(userService.submit(user));

--
Gitblit v1.9.3