From 8dd9ff339045a922c41dc99f4b7d1dc4375a7596 Mon Sep 17 00:00:00 2001 From: zhangqihang Date: Thu, 29 Feb 2024 15:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/app/AppHiddenController.java | 3 +++ .../inspection/impl/SafetyEnvironmentalServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index e21ca7a..ed968a2 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -2262,6 +2262,9 @@ public class AppHiddenController extends BaseController { && pd.get("isIndex").toString().equals("1")) { pd.put("SELF_USER_ID", pd.get("SELFUSERID")); } + if ("undefined".equals(pd.getString("isIndex"))) { + pd.put("isIndex", ""); + } pd.put("ISMAIN", "0"); String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 if (Tools.notEmpty(DISPOSESTATE)) { diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index 4edeeed..91b45d6 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -409,7 +409,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2 hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3 } - hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称 + hidden.put("HIDDENTYPE_NAME", StringUtils.isNotBlank(json.getString("HIDDENTYPENAME")) ? json.getString("HIDDENTYPENAME") : json.getString("HIDDENTYPE_NAME"));//隐患类型名称 hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间