From 18c5f12f13d505f6ae694f5165960db92842d40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 13 Mar 2023 17:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91ConfigConvert?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../converter/convert/ConfigConvert.java      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/convert/ConfigConvert.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/convert/ConfigConvert.java
index f2940ae5..1816234e 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/convert/ConfigConvert.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/convert/ConfigConvert.java
@@ -7,6 +7,7 @@ import com.jero.common.system.vo.DictModel;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.generater.modules.online.cgform.converter.FieldCommentConverter;
+import java.util.Collections;
 
 public class ConfigConvert implements FieldCommentConverter {
     protected ISysBaseAPI a;
@@ -16,7 +17,7 @@ public class ConfigConvert implements FieldCommentConverter {
     protected String e;
 
     public ConfigConvert() {
-        this.a = (ISysBaseAPI)SpringContextUtils.getBean(ISysBaseAPI.class);
+        this.a = SpringContextUtils.getBean(ISysBaseAPI.class);
     }
 
     public ConfigConvert(String var1, String var2, String var3) {
@@ -58,10 +59,11 @@ public class ConfigConvert implements FieldCommentConverter {
         this.e = text;
     }
 
+    @Override
     public String converterToVal(String txt) {
         if (oConvertUtils.isNotEmpty(txt)) {
             String var2 = this.e + "= '" + txt + "'";
-            String var3 = null;
+            String var3;
             int var4 = this.c.indexOf("where");
             if (var4 > 0) {
                 var3 = this.c.substring(0, var4).trim();
@@ -70,19 +72,20 @@ public class ConfigConvert implements FieldCommentConverter {
                 var3 = this.c;
             }
 
-            List var5 = this.a.queryFilterTableDictInfo(var3, this.e, this.d, var2);
-            if (var5 != null && var5.size() > 0) {
-                return ((DictModel)var5.get(0)).getValue();
+            List<DictModel> var5 = this.a.queryFilterTableDictInfo(var3, this.e, this.d, var2);
+            if (var5 != null && !var5.isEmpty()) {
+                return var5.get(0).getValue();
             }
         }
 
         return null;
     }
 
+    @Override
     public String converterToTxt(String val) {
         if (oConvertUtils.isNotEmpty(val)) {
             String var2 = this.d + "= '" + val + "'";
-            String var3 = null;
+            String var3;
             int var4 = this.c.indexOf("where");
             if (var4 > 0) {
                 var3 = this.c.substring(0, var4).trim();
@@ -91,16 +94,17 @@ public class ConfigConvert implements FieldCommentConverter {
                 var3 = this.c;
             }
 
-            List var5 = this.a.queryFilterTableDictInfo(var3, this.e, this.d, var2);
-            if (var5 != null && var5.size() > 0) {
-                return ((DictModel)var5.get(0)).getText();
+            List<DictModel> var5 = this.a.queryFilterTableDictInfo(var3, this.e, this.d, var2);
+            if (var5 != null && !var5.isEmpty()) {
+                return var5.get(0).getText();
             }
         }
 
         return null;
     }
 
+    @Override
     public Map<String, String> getConfig() {
-        return null;
+        return Collections.emptyMap();
     }
 }