From d0555f1f93fe2a23bbff14cbed45466c28c19197 Mon Sep 17 00:00:00 2001
From: "20932067@zju.edu.cn" <Clay>
Date: Sat, 10 Apr 2021 22:44:37 +0800
Subject: [PATCH] 11

---
 .../src/views/system/query/queryDate.vue      |  1 -
 hchyun-ui/src/views/tool/query/uniQuery.vue   |  7 ----
 .../service/impl/QueryServiceImpl.java        | 35 ++++++++++++-------
 .../service/impl/RealQueryServiceImpl.java    |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/hchyun-ui/src/views/system/query/queryDate.vue b/hchyun-ui/src/views/system/query/queryDate.vue
index 260d4ef..6d30641 100644
--- a/hchyun-ui/src/views/system/query/queryDate.vue
+++ b/hchyun-ui/src/views/system/query/queryDate.vue
@@ -111,7 +111,6 @@ export default {
   created() {
     this.dataId = this.$route.fullPath.split("/")[3]
     RealInfo(this.dataId).then(res => {
-      console.log(res)
       this.uconList = listInit(res.data)
     })
     this.handleQuery()
diff --git a/hchyun-ui/src/views/tool/query/uniQuery.vue b/hchyun-ui/src/views/tool/query/uniQuery.vue
index 60c86fb..ad3d68c 100644
--- a/hchyun-ui/src/views/tool/query/uniQuery.vue
+++ b/hchyun-ui/src/views/tool/query/uniQuery.vue
@@ -280,13 +280,6 @@ export default {
           })
           return false;
         }
-        if (list[i].ucMock == "") {
-          Message({
-            message: "序号" + i + "模拟数据不能为空!",
-            type: 'error'
-          })
-          return false;
-        }
       }
       return true
     },
diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java
index c8e449f..2816529 100644
--- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java
+++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java
@@ -125,15 +125,14 @@ public class QueryServiceImpl implements QueryService {
             List<UniCon> uniConList = uniQuery.getUniCons();
             if (sql.toString().contains("insert") || sql.toString().contains("delete ") || sql.toString().contains("update ") ||
                     sql.toString().contains("drop ") || sql.toString().contains("database ") || sql.toString().contains("create ") ||
-                    sql.toString().contains("view ") || sql.toString().contains("alter ")|| sql.toString().contains("gen_")) {
+                    sql.toString().contains("view ") || sql.toString().contains("alter ") || sql.toString().contains("gen_")) {
                 return new GenServerResult<>(false, "sql语句含有insert,delete,update,drop,database,view,alter,gen_等特殊字符!");
             }
             if (uniConList.size() > 0) {
                 sql.append(" where 1 = 1");
                 for (UniCon uniCon : uniConList) {
-                    if(!uniCon.getUcMock().equals("")){
-                        sql.append(conversionPreview(uniCon));
-                    }
+                    if (!uniCon.getUcMock().equals("") && uniCon.getUcMock() != null)
+                    sql.append(conversionPreview(uniCon));
                 }
             }
             List<Map<String, Object>> dataMap = queryDao.UniQuery(sql.toString());
@@ -146,6 +145,7 @@ public class QueryServiceImpl implements QueryService {
 
     /**
      * 预览模式下拼接sql
+     *
      * @param uniCon
      * @return
      */
@@ -174,15 +174,24 @@ public class QueryServiceImpl implements QueryService {
                 sql += uniCon.getUcKey() + " like '%" + uniCon.getUcMock() + "%'";
                 break;
             case "BETWEEN":
-                JSONObject jsonObject = JSONObject.parseObject(uniCon.getUcMock());
-                if (uniCon.getUcType().equals("input")) {
-                    Object begin = jsonObject.get("begin");
-                    Object end = jsonObject.get("end");
-                    sql += uniCon.getUcKey() + " between '" + begin + "' AND '" + end + "'";
-                } else if (uniCon.getUcType().equals("datetime")) {
-                    Object startTime = jsonObject.get("startTime");
-                    Object endTime = jsonObject.get("endTime");
-                    sql += uniCon.getUcKey() + " between '" + startTime + "' AND '" + endTime + "'";
+                try {
+                    JSONObject jsonObject = JSONObject.parseObject(uniCon.getUcMock());
+                    if (uniCon.getUcType().equals("input")) {
+                        Object begin = jsonObject.get("begin");
+                        Object end = jsonObject.get("end");
+                        if (begin != null && end != null) {
+                            sql += uniCon.getUcKey() + " between '" + begin + "' AND '" + end + "'";
+                        } else {
+                            sql = "";
+                        }
+                    } else if (uniCon.getUcType().equals("datetime")) {
+                        Object startTime = jsonObject.get("startTime");
+                        Object endTime = jsonObject.get("endTime");
+                        sql += uniCon.getUcKey() + " between '" + startTime + "' AND '" + endTime + "'";
+                    }
+                } catch (RuntimeException e) {
+                    logger.error(e.getMessage());
+                    sql = "";
                 }
                 break;
         }
diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/RealQueryServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/RealQueryServiceImpl.java
index 44391e8..488a443 100644
--- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/RealQueryServiceImpl.java
+++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/RealQueryServiceImpl.java
@@ -73,7 +73,7 @@ public class RealQueryServiceImpl implements RealQueryService {
     }
 
     public String conversionReal(RealUniCon realUniCon) {
-        if (realUniCon.getUcReal() == null) {
+        if (realUniCon.getUcReal() == null&&!realUniCon.getUcReal().equals("")) {
             return "";
         } else {
             String sql = " and ";