From 6e318754cd1f47bb26efa2d4a3866df306bf468e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Sep 2021 10:01:57 +0800
Subject: [PATCH] =?UTF-8?q?add=20[@CompanyNameTranslate]=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/aspect/CompanyNameAspect.java | 17 +++++++++--------
 .../aspect/annotation/CompanyNameTranslate.java |  2 +-
 .../main/java/com/jero/util/ObjRecordUtil.java  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/CompanyNameAspect.java b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/CompanyNameAspect.java
index b3b7dca8..086c6788 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/CompanyNameAspect.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/CompanyNameAspect.java
@@ -63,20 +63,20 @@ public class CompanyNameAspect {
             Object result1 = ((Result<Object>) result).getResult();
             String jsonStr = JSONUtil.toJsonStr(result1);
             if (((Result) result).getResult() instanceof IPage) {
-                List<PayCompanyManagement> items = new ArrayList<>();
+                List<Object> items = new ArrayList<>();
                 for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) {
 
-                    PayCompanyManagement translate = translate(record, companyNameTranslate);
+                    Object translate = translate(record, companyNameTranslate);
                     items.add(translate);
                 }
                 ((IPage) ((Result) result).getResult()).setRecords(items);
             } else if (JSONUtil.isJsonObj(jsonStr)) {
-                PayCompanyManagement translate = translate(result1, companyNameTranslate);
+                Object translate = translate(result1, companyNameTranslate);
                 ((Result<Object>) result).setResult(translate);
             } else {
-                List<PayCompanyManagement> items = new ArrayList<>();
+                List<Object> items = new ArrayList<>();
                 for (Object o : (List<Object>) result1) {
-                    PayCompanyManagement translate = translate(o, companyNameTranslate);
+                    Object translate = translate(o, companyNameTranslate);
                     items.add(translate);
                 }
                 ((Result<Object>) result).setResult(items);
@@ -84,7 +84,8 @@ public class CompanyNameAspect {
         }
     }
 
-    private PayCompanyManagement translate(Object record, CompanyNameTranslate companyNameTranslate) {
+    private Object translate(Object record, CompanyNameTranslate companyNameTranslate) {
+        Class<?> recordClass = record.getClass();
         ObjectMapper mapper = new ObjectMapper();
         String json = "{}";
         try {
@@ -96,7 +97,7 @@ public class CompanyNameAspect {
         JSONObject item = JSONObject.parseObject(json);
         String fieldId = companyNameTranslate.fieldId();
         String fieldName = companyNameTranslate.fieldName();
-        String splicing = companyNameTranslate.Splicing();
+        String splicing = companyNameTranslate.splicing();
 
         for (Field field : oConvertUtils.getAllFields(record)) {
 
@@ -109,6 +110,6 @@ public class CompanyNameAspect {
                 }
             }
         }
-        return JSONObject.parseObject(String.valueOf(item),PayCompanyManagement.class);
+        return JSONObject.parseObject(String.valueOf(item),recordClass);
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java
index aa9a2138..5dca42f2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java
@@ -23,5 +23,5 @@ public @interface CompanyNameTranslate {
     /**
      *  拼接内容
      */
-    String Splicing() default " (待审核)";
+    String splicing() default " (待审核)";
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/ObjRecordUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/ObjRecordUtil.java
index 2b324964..baaca0e8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/util/ObjRecordUtil.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/ObjRecordUtil.java
@@ -51,7 +51,7 @@ public class ObjRecordUtil {
                     field2.setAccessible(true);    // 设置属性是可以访问的(私有的也可以)
                     if (field1.equals(field2)) {    // 比较属性名是否一样
                         if (field2.get(newObj) == null || StringUtils.isEmpty(field2.get(newObj) + "")) {
-                            break;    // 属性名称一样就退出二级循环
+                            break;    // 属性名称为空
                         }
                         if (!Objects.equals(field1.get(oldObj), field2.get(newObj))) {    // 比较属性值是否一样
                             // 得到注解