修复Example没有Criteria条件的非正常情况Bug

duwey · duwey · commit 59bebcbdb461 · 2018-12-02T23:53:20.000+08:00
diff --git a/base/src/test/java/tk/mybatis/mapper/test/logic/TestLogicDelete.java b/base/src/test/java/tk/mybatis/mapper/test/logic/TestLogicDelete.java
@@ -388,5 +388,27 @@ public void testUpdateByExampleSelective() {
         }
     }
 
+    @Test
+    // Example中没有条件的非正常情况，where条件应只有逻辑删除注解的未删除条件
+    public void testExampleWithNoCriteria() {
+        SqlSession sqlSession = MybatisHelper.getSqlSession();
+        try {
+            TbUserLogicDeleteMapper logicDeleteMapper = sqlSession.getMapper(TbUserLogicDeleteMapper.class);
+
+            Example example = new Example(TbUserLogicDelete.class);
+
+            TbUserLogicDelete tbUserLogicDelete = new TbUserLogicDelete();
+            tbUserLogicDelete.setUsername("123");
 
+            Assert.assertEquals(5, logicDeleteMapper.updateByExample(tbUserLogicDelete, example));
+
+            Assert.assertEquals(5, logicDeleteMapper.updateByExampleSelective(tbUserLogicDelete, example));
+
+            List<TbUserLogicDelete> list = logicDeleteMapper.selectByExample(example);
+            Assert.assertEquals(5, list.size());
+        } finally {
+            sqlSession.rollback();
+            sqlSession.close();
+        }
+    }
 }
diff --git a/core/src/main/java/tk/mybatis/mapper/entity/Example.java b/core/src/main/java/tk/mybatis/mapper/entity/Example.java
@@ -221,6 +221,10 @@ public void clear() {
         distinct = false;
     }
 
+    public Map<String, EntityColumn> getPropertyMap() {
+        return propertyMap;
+    }
+
     public static class OrderBy {
         //属性和列对应
         protected Map<String, EntityColumn> propertyMap;
@@ -294,10 +298,6 @@ protected GeneratedCriteria(Map<String, EntityColumn> propertyMap, boolean exist
             this.propertyMap = propertyMap;
         }
 
-        public Map<String, EntityColumn> getPropertyMap() {
-            return propertyMap;
-        }
-
         private String column(String property) {
             if (propertyMap.containsKey(property)) {
                 return propertyMap.get(property).getColumn();
diff --git a/core/src/main/java/tk/mybatis/mapper/util/OGNL.java b/core/src/main/java/tk/mybatis/mapper/util/OGNL.java
@@ -234,26 +234,26 @@ public static String andOr(Object parameter) {
      * @return
      */
     public static String andNotLogicDelete(Object parameter) {
+        String result = "";
         if (parameter instanceof Example) {
-            try {
-                List<Example.Criteria> criteriaList = ((Example)parameter).getOredCriteria();
-                if (criteriaList != null && criteriaList.size() != 0) {
-                    // 随便拿一个得到propertyMap，判断是否有逻辑删除注解的字段
-                    Example.Criteria tempCriteria = criteriaList.get(0);
-                    Map<String, EntityColumn> propertyMap = tempCriteria.getPropertyMap();
-                    for (Map.Entry<String, EntityColumn> entry: propertyMap.entrySet()) {
-                        EntityColumn column = entry.getValue();
-                        if (column.getEntityField().isAnnotationPresent(LogicDelete.class)) {
-                            // 未逻辑删除的条件
-                            return column.getColumn() + " = " + SqlHelper.getLogicDeletedValue(column, false) + " and ";
-                        }
+            Example example = (Example) parameter;
+            Map<String, EntityColumn> propertyMap = example.getPropertyMap();
+
+            for (Map.Entry<String, EntityColumn> entry: propertyMap.entrySet()) {
+                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 ";
                     }
                 }
-            } catch (ClassCastException e) {
-                return "";
             }
         }
-        return "";
+        return result;
     }
 
 }
