diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java index 04390ca82022acbc0c449a769c7583228aafd89d..c0a47974fbb0b67221ed9e0d88fc7b371a709943 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java @@ -17,5 +17,5 @@ public interface DataDictService { CommonResult<Boolean> deleteDataDict(Integer adminId, Integer dataDictId); - CommonResult<DataDictBO> getDataDict(String dictKey, String dictValue); + CommonResult<DataDictBO> getDataDict(String dictKey, Object dictValue); } diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java index 7ca34c7cc98209a3a356015ed3591cb90a8b9496..479388802aea5a5476ca1cef2706a98053777087 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; /** @@ -10,7 +11,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class DataDictBO { +public class DataDictBO implements Serializable { /** * ç¼–å· diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java index 1acc72f6187441b7163bb88f38298942af836858..663d7fc7540f8fef3f0a875cba874fe0ee9f4376 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java @@ -88,8 +88,8 @@ public class DataDictServiceImpl implements DataDictService { } @Override - public CommonResult<DataDictBO> getDataDict(String dictKey, String dictValue) { - DataDictDO dataDictDO = dataDictMapper.selectByEnumValueAndValue(dictKey, dictValue); + public CommonResult<DataDictBO> getDataDict(String dictKey, Object dictValue) { + DataDictDO dataDictDO = dataDictMapper.selectByEnumValueAndValue(dictKey, String.valueOf(dictValue)); DataDictBO dataDictBO = DataDictConvert.INSTANCE.convert(dataDictDO); return CommonResult.success(dataDictBO); }