From 7be63ffa39bc0b40366b5be416cefcb910d655a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:43:33 +0800
Subject: [PATCH] optimize

---
 service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
index 365d740..e8271a4 100644
--- a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
@@ -31,17 +31,18 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
-        Assert.hasKeyAndValue(reqJson, "startDate", "鏈寘鍚紑濮嬫椂闂�");
-        Assert.hasKeyAndValue(reqJson, "endDate", "鏈寘鍚粨鏉熸椂闂�");
-        String startDate = reqJson.getString("startDate");
-        String endDate = reqJson.getString("endDate");
-        if (!startDate.contains(":")) {
-            startDate += " 00:00:00";
-            reqJson.put("startDate", startDate);
-        }
-        if (!endDate.contains(":")) {
-            endDate += " 23:59:59";
-            reqJson.put("endDate", endDate);
+
+        if(reqJson.containsKey("startDate") && reqJson.containsKey("endDate")) {
+            String startDate = reqJson.getString("startDate");
+            String endDate = reqJson.getString("endDate");
+            if (!startDate.contains(":")) {
+                startDate += " 00:00:00";
+                reqJson.put("startDate", startDate);
+            }
+            if (!endDate.contains(":")) {
+                endDate += " 23:59:59";
+                reqJson.put("endDate", endDate);
+            }
         }
     }
 

--
Gitblit v1.8.0