From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
index d988cf1..eedde92 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
@@ -1,12 +1,11 @@
package com.vci.rmip.code.client.codeapply.Apply410.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
+
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.text.ParseException;
@@ -54,7 +53,7 @@
try{
//鍙栧緱鍊肩殑绫诲舰
Class type = PropertyUtils.getPropertyType(obj, fieldName);
- if(!StringUtils.isEmpty(type)){
+ if(type!=null){
PropertyUtils.setProperty(obj, fieldName,convert(value, type));
}
@@ -110,8 +109,7 @@
try{
//鍙栧緱鍊肩殑绫诲舰
Class type = PropertyUtils.getPropertyType(obj, fieldName);
- if(!StringUtils.isEmpty(type)){
-
+ if(type!=null){
PropertyUtils.setProperty(obj, fieldName,convert(value, type));
}
}catch(Exception ex){
--
Gitblit v1.9.3