修复 Example.Criteria 未设置 where 条件查询时，带有逻辑删除注解的表报错问题，fixed #722

Author: DiligentNezha

core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java

@@ -944,7 +944,6 @@ public static String exampleCheck(Class<?> entityClass) {
     public static String exampleWhereClause() {
         return "<if test=\"_parameter != null\">" +
                 "<where>\n" +
-                " ${@tk.mybatis.mapper.util.OGNL@andNotLogicDelete(_parameter)}" +
                 " <trim prefix=\"(\" prefixOverrides=\"and |or \" suffix=\")\">\n" +
                 "  <foreach collection=\"oredCriteria\" item=\"criteria\">\n" +
                 "    <if test=\"criteria.valid\">\n" +
@@ -973,6 +972,7 @@ public static String exampleWhereClause() {
                 "    </if>\n" +
                 "  </foreach>\n" +
                 " </trim>\n" +
+                " ${@tk.mybatis.mapper.util.OGNL@andNotLogicDelete(_parameter)}" +
                 "</where>" +
                 "</if>";
     }
@@ -984,7 +984,6 @@ public static String exampleWhereClause() {
      */
     public static String updateByExampleWhereClause() {
         return "<where>\n" +
-                " ${@tk.mybatis.mapper.util.OGNL@andNotLogicDelete(example)}" +
                 " <trim prefix=\"(\" prefixOverrides=\"and |or \" suffix=\")\">\n" +
                 "  <foreach collection=\"example.oredCriteria\" item=\"criteria\">\n" +
                 "    <if test=\"criteria.valid\">\n" +
@@ -1013,6 +1012,7 @@ public static String updateByExampleWhereClause() {
                 "    </if>\n" +
                 "  </foreach>\n" +
                 " </trim>\n" +
+                " ${@tk.mybatis.mapper.util.OGNL@andNotLogicDelete(example)}" +
                 "</where>";
     }
 

core/src/main/java/tk/mybatis/mapper/util/OGNL.java

@@ -243,13 +243,7 @@ public static String andNotLogicDelete(Object parameter) {
                 EntityColumn column = entry.getValue();
                 if (column.getEntityField().isAnnotationPresent(LogicDelete.class)) {
                     // 未逻辑删除的条件
-                    result = column.getColumn() + " = " + SqlHelper.getLogicDeletedValue(column, false);
-
-                    // 如果Example中有条件，则拼接" and "，
-                    // 如果是空的oredCriteria，则where中只有逻辑删除注解的未删除条件
-                    if (example.getOredCriteria() != null && example.getOredCriteria().size() != 0) {
-                        result += " and ";
-                    }
+                    result = "and " + column.getColumn() + " = " + SqlHelper.getLogicDeletedValue(column, false);
                 }
             }
         }