gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev-7.3.3' into dev-7.3.4

pull/52/head
ye_star 2023-03-17 08:23:53 +08:00
parent 18743c4b99 dd66971d04
commit 8df6f1361e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java
View File

@ -202,13 +202,14 @@ public class WrapperAop {
private Map<String, Object> wrapPureObject(Object originModel, Class<? extends BaseWrapper<?>>[] baseWrapperClasses) { private Map<String, Object> wrapPureObject(Object originModel, Class<? extends BaseWrapper<?>>[] baseWrapperClasses) {
// 首先将原始的对象转化为map // 首先将原始的对象转化为map
Map<String, Object> originMap = BeanUtil.beanToMap(originModel); Map<String, Object> originMap = null;
// 经过多个包装类填充属性 // 经过多个包装类填充属性
try { try {
for (Class<? extends BaseWrapper<?>> baseWrapperClass : baseWrapperClasses) { for (Class<? extends BaseWrapper<?>> baseWrapperClass : baseWrapperClasses) {
BaseWrapper baseWrapper = baseWrapperClass.newInstance(); BaseWrapper baseWrapper = baseWrapperClass.newInstance();
Map<String, Object> incrementFieldsMap = baseWrapper.doWrap(originModel); Map<String, Object> incrementFieldsMap = baseWrapper.doWrap(originModel);
originMap = BeanUtil.beanToMap(originModel);
originMap.putAll(incrementFieldsMap); originMap.putAll(incrementFieldsMap);
} }
} catch (Exception e) { } catch (Exception e) {

2
pom.xml
View File

@ -152,7 +152,7 @@
<aliyun.java.sdk.core>3.0.0</aliyun.java.sdk.core> <aliyun.java.sdk.core>3.0.0</aliyun.java.sdk.core>
<aliyun.java.sdk.dm>3.1.0</aliyun.java.sdk.dm> <aliyun.java.sdk.dm>3.1.0</aliyun.java.sdk.dm>
<activation.version>1.1.1</activation.version> <activation.version>1.1.1</activation.version>
<easy.excel.version>2.2.6</easy.excel.version> <easy.excel.version>3.2.1</easy.excel.version>
<pinyin4j.version>2.5.0</pinyin4j.version> <pinyin4j.version>2.5.0</pinyin4j.version>
<openfeign.version>2.2.6.RELEASE</openfeign.version> <openfeign.version>2.2.6.RELEASE</openfeign.version>
<seata.all.version>1.3.0</seata.all.version> <seata.all.version>1.3.0</seata.all.version>