优化字典

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java

@@ -98,7 +98,7 @@ public class DictInTermTypeMapper extends AbstractSqlTermCustomer {
         } else {
             n = not ? "!=" : "=";
         }
-        return new SqlAppender().add(bitAnd, n, any ? "0" : where);
+        return new SqlAppender().add(bitAnd, n, any ? "0" : columnName);
 
     }
 

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java

@@ -87,10 +87,11 @@ public class DictTermTypeMapper extends AbstractSqlTermCustomer {
 
     protected SqlAppender buildNotSupport(String wherePrefix, Term term, RDBColumnMetaData column, String tableAlias) {
         createChangedTermValue(term);
+
         Dialect dialect = column.getTableMetaData().getDatabaseMetaData().getDialect();
         String columnName = dialect.buildColumnName(tableAlias, column.getName());
         SqlAppender appender = new SqlAppender();
-        appender.add(columnName, not ? " != " : "=", "#{", wherePrefix, ".value.value}");
+        appender.add(columnName, not ? " != " : "=", "#{", wherePrefix, ".value}");
         return appender;
     }
 }

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java

@@ -67,7 +67,7 @@ public class TestCrud extends AbstractTransactionalJUnit4SpringContextTests {
 
         QueryParamEntity query = new QueryParamEntity();
         //any in
-        query.where("dataTypes$in$any", Arrays.asList(DataType.TYPE1, DataType.TYPE3,DataType.TYPE2));
+        query.where("dataTypes$in$any", Arrays.asList(DataType.TYPE1,DataType.TYPE2));
         query.includes("nest.name", "*");
         List<TestEntity> entities = testDao.queryNest(query);