Browse Source

小优化

zhou-hao 6 years ago
parent
commit
8720912226

+ 1 - 1
hsweb-core/src/test/java/org/hswebframework/web/dict/UserCode.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 @AllArgsConstructor
 @Dict(id = "UserCode")
 @JSONType(deserializer = EnumDict.EnumDictJSONDeserializer.class)
-public enum UserCode implements EnumDict {
+public enum UserCode implements EnumDict<String> {
 
     SIMPLE("SIMPLE", "TEXT", "测试"),
     TEST("TEST", "TEST", "测试"),

+ 1 - 1
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/util/QueryUtils.java

@@ -70,7 +70,7 @@ public class QueryUtils {
             String finalName = name;
             AtomicBoolean found = new AtomicBoolean(false);
             ReflectionUtils.doWithMethods(type, method -> {
-                if (method.getParameterCount() == 1 && method.getName().equals(finalName)) {
+                if (method.getParameterCount() == 1 && (method.getName().equals(finalName) || method.getName().equals(term.getColumn()))) {
                     Object value = FastBeanCopier.DEFAULT_CONVERT.convert(term.getValue(), method.getParameterTypes()[0], FastBeanCopier.EMPTY_CLASS_ARRAY);
                     ReflectionUtils.invokeMethod(method, query, value);
                     found.set(true);