From 52cddf9d992e228dbcbdba6bcf1aa4653ff213dd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 六月 2020 14:40:08 +0800
Subject: [PATCH] 优化 操作手册

---
 java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
index dd8c5d0..a17b616 100644
--- a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -249,9 +249,9 @@
 
             String currentSql = sqlObj.getString(dataQuery.getTemplateKey());
             //澶勭悊 if 鍒ゆ柇
-            logger.debug("dealSqlIf寮�濮嬪鐞唖ql涓殑<if>鑺傜偣 "+ currentSql + " 鍏ュ弬:" + params.toJSONString());
+            logger.debug("dealSqlIf寮�濮嬪鐞唖ql涓殑<if>鑺傜偣 " + currentSql + " 鍏ュ弬:" + params.toJSONString());
             currentSql = dealSqlIf(currentSql, params);
-            logger.debug("dealSqlIf澶勭悊瀹屾垚sql涓殑<if>鑺傜偣 "+ currentSql + " 鍏ュ弬:" + params.toJSONString());
+            logger.debug("dealSqlIf澶勭悊瀹屾垚sql涓殑<if>鑺傜偣 " + currentSql + " 鍏ュ弬:" + params.toJSONString());
 
 
             String[] sqls = currentSql.split("#");
@@ -284,7 +284,7 @@
                         param = params.getInteger(sqls[sqlIndex]);
                     }
                     //杩欓噷瀵� page 鍜� rows 鐗规畩澶勭悊 锛岀洰鍓嶆病鏈夋兂鍒板叾浠栫殑鍔炴硶
-                    if (StringUtils.isNumeric(param.toString()) && "page,rows".contains(sqls[sqlIndex])) {
+                    if (StringUtils.isNumeric(param.toString()) && "page,rows,row".contains(sqls[sqlIndex])) {
                         param = Integer.parseInt(param.toString());
                     }
                     currentParams.add(param);
@@ -343,6 +343,11 @@
 
         String[] oSqls = oldSql.split("</if>");
         for (String oSql : oSqls) {
+            logger.debug("澶勭悊if 鑺傜偣锛屽綋鍓嶅鐞嗙殑oSql=" + oSql + "鎬荤殑oSqls = " + oSqls);
+            if(StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")){
+                newSql.append(oSql);
+                continue;
+            }
             if (!oSql.startsWith("<if")) {
                 newSql.append(oSql.substring(0, oSql.indexOf("<if")));
             }
@@ -371,7 +376,7 @@
         }
 
 
-        return newSql.toString();
+        return newSql.toString().replace("&gt;", ">").replace("&lt;", "<");
 
     }
 

--
Gitblit v1.8.0