From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化

---
 java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
index 4d1ba8f..71b1eda 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
@@ -69,6 +69,10 @@
      */
     public static <T1, T2> T2 covertBean(T1 orgBean, T2 dstBean) {
 
+        if(orgBean == null){
+            return dstBean;
+        }
+
         try {
             //BeanUtils.copyProperties(dstBean, orgBean);
             if (orgBean instanceof Map) {
@@ -97,9 +101,12 @@
             //System.out.println("瀛楁绫诲瀷" + dstClass);
 
             Object value = orgMap.get(field.getName());
+            if(value == null){
+                continue;
+            }
             //String 杞琩ate
             Object tmpValue = Java110Converter.getValue(value, dstClass);
-            System.out.println("tmpValue"+value.toString());
+            //System.out.println("tmpValue"+value.toString());
             beanMap.put(field.getName(), tmpValue);
         }
     }

--
Gitblit v1.8.0