From 4e6d6105915edcc630d6a8bcc1c56a6177c88686 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 18:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
index 8878b61..fc7ad29 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
@@ -71,7 +71,10 @@
public AjaxResult holeProcess(Hole hole) {
Hole hole2 = holeMapper.selectProjectProcess(hole.getProjectId());
- Double process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
+ Double process =0.0d;
+ if(ObjectUtil.isNotEmpty(hole2.getFootageCpl()) && ObjectUtil.isNotEmpty(hole2.getFootage())) {
+ process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
+ }
return AjaxResult.success(process);
}
--
Gitblit v1.9.1