wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修复bug

pull/5/head^2
zhangqihang 2024-02-29 15:43:39 +08:00
parent f26dbe0980
commit 8dd9ff3390
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -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)) {

2
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -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")); //隐患发现时间