소스 검색

fix error

zhouhao 6 년 전
부모
커밋
9dfcb8d0d2

+ 1 - 1
hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/src/main/java/org/hswebframework/web/service/oauth2/OAuth2CrudService.java

@@ -2,7 +2,7 @@ package org.hswebframework.web.service.oauth2;
 
 public interface OAuth2CrudService<E, PK> extends OAuth2QueryService<E, PK>
         , OAuth2QueryByEntityService<E>
-        , OAuth2DeleteService<PK>
+        , OAuth2DeleteService<E,PK>
         , OAuth2InsertService<E, PK>
         , OAuth2UpdateService<E, PK> {
 }

+ 3 - 3
hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/src/main/java/org/hswebframework/web/service/oauth2/OAuth2DeleteService.java

@@ -2,9 +2,9 @@ package org.hswebframework.web.service.oauth2;
 
 import org.hswebframework.web.service.DeleteService;
 
-public interface OAuth2DeleteService<PK> extends DeleteService<PK>, OAuth2ServiceSupport {
+public interface OAuth2DeleteService<E, PK> extends DeleteService<E, PK>, OAuth2ServiceSupport {
     @Override
-    default int deleteByPk(PK pk) {
-        return createRequest("/" + pk).delete().as(Integer.class);
+    default E deleteByPk(PK pk) {
+        return createRequest("/" + pk).delete().as(getEntityType());
     }
 }

+ 1 - 1
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java

@@ -601,7 +601,7 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
                 .contains(javaType) || javaType != Map.class || javaType != List.class;
 
         if (javaType.isEnum() && EnumDict.class.isAssignableFrom(javaType)) {
-            return new EnumDictValueConverter<EnumDict>(() -> new Arr);
+            return new EnumDictValueConverter<EnumDict>(() -> (List) Arrays.asList(javaType.getEnumConstants()));
         }
         switch (jdbcType) {
             case BLOB:

+ 1 - 1
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java

@@ -47,7 +47,7 @@ public class DictionaryOptionalConvertBuilderStrategy implements OptionalConvert
         converter.setWriteObject(!"false".equalsIgnoreCase(writeObject));
 
         if (!StringUtils.isEmpty(sppliter)) {
-            converter.setSplitter(str -> new Arr);
+            converter.setSplitter(str -> Arrays.asList(str.split(sppliter)));
         }
 
         return converter;