diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java
index d093d656..48991178 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java
@@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
+import org.jetbrains.annotations.NotNull;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -97,22 +98,7 @@ public class CgformUtil {
             int var3 = var1.size();
             boolean var4 = false;
 
-            for(int var5 = 0; var5 < var3; ++var5) {
-                OnlCgformField var6 = var1.get(var5);
-                if ("id".equals(var6.getDbFieldName())) {
-                    var4 = true;
-                }
-
-                if (CAT_TREE.equals(var6.getFieldShowType()) && oConvertUtils.isNotEmpty(var6.getDictText())) {
-                    var2.append(var6.getDictText()).append(",");
-                }
-
-                if (var5 == var3 - 1) {
-                    var2.append(var6.getDbFieldName()).append(" ");
-                } else {
-                    var2.append(var6.getDbFieldName()).append(",");
-                }
-            }
+            var4 = isVar4(var1, var2, var3, var4);
 
             if (!var4) {
                 var2.append(",id");
@@ -124,6 +110,26 @@ public class CgformUtil {
         var2.append(FROM).append(f(var0));
     }
 
+    private static boolean isVar4(List<OnlCgformField> var1, StringBuilder var2, int var3, boolean var4) {
+        for(int var5 = 0; var5 < var3; ++var5) {
+            OnlCgformField var6 = var1.get(var5);
+            if ("id".equals(var6.getDbFieldName())) {
+                var4 = true;
+            }
+
+            if (CAT_TREE.equals(var6.getFieldShowType()) && oConvertUtils.isNotEmpty(var6.getDictText())) {
+                var2.append(var6.getDictText()).append(",");
+            }
+
+            if (var5 == var3 - 1) {
+                var2.append(var6.getDbFieldName()).append(" ");
+            } else {
+                var2.append(var6.getDbFieldName()).append(",");
+            }
+        }
+        return var4;
+    }
+
     public static String a(String var0) {
         return " to_date('" + var0 + "','yyyy-MM-dd HH24:mi:ss')";
     }
@@ -291,28 +297,7 @@ public class CgformUtil {
                 if (var12.length == 1) {
                     a(var8, var11, var10, var6, (JSONObject)null, var9 == 0);
                 } else if (var12.length == 2) {
-                    String var13 = var12[0];
-                    String var14 = var12[1];
-                    JSONObject var15 = (JSONObject)var7.get(var13);
-                    if (var15 == null) {
-                        List<OnlCgformField> var16 = var2.queryFormFieldsByTableName(var13);
-                        var15 = new JSONObject(3);
-                        Iterator<OnlCgformField> var17 = var16.iterator();
-
-                        while(var17.hasNext()) {
-                            OnlCgformField var18 = var17.next();
-                            if (StringUtils.isNotBlank(var18.getMainTable())) {
-                                var15.put("subTableName", var13);
-                                var15.put("subField", var18.getDbFieldName());
-                                var15.put("mainTable", var18.getMainTable());
-                                var15.put("mainField", var18.getMainField());
-                            }
-                        }
-
-                        var7.put(var13, var15);
-                    }
-
-                    a(var8, var14, var10, var6, var15, var9 == 0);
+                    putVar15(var2, var6, var7, var8, var9, var10, var12);
                 }
             }
 
@@ -322,6 +307,31 @@ public class CgformUtil {
         }
     }
 
+    private static void putVar15(IOnlCgformFieldService var2, MatchTypeEnum var6, HashMap<String, Object> var7, StringBuilder var8, int var9, JSONObject var10, String[] var12) {
+        String var13 = var12[0];
+        String var14 = var12[1];
+        JSONObject var15 = (JSONObject)var7.get(var13);
+        if (var15 == null) {
+            List<OnlCgformField> var16 = var2.queryFormFieldsByTableName(var13);
+            var15 = new JSONObject(3);
+            Iterator<OnlCgformField> var17 = var16.iterator();
+
+            while(var17.hasNext()) {
+                OnlCgformField var18 = var17.next();
+                if (StringUtils.isNotBlank(var18.getMainTable())) {
+                    var15.put("subTableName", var13);
+                    var15.put("subField", var18.getDbFieldName());
+                    var15.put("mainTable", var18.getMainTable());
+                    var15.put("mainField", var18.getMainField());
+                }
+            }
+
+            var7.put(var13, var15);
+        }
+
+        a(var8, var14, var10, var6, var15, var9 == 0);
+    }
+
     private static void a(StringBuilder var0, String var1, JSONObject var2, MatchTypeEnum var3, JSONObject var4, boolean var5) {
         if (!var5) {
             var0.append(" ").append(var3.getValue()).append(" ");
@@ -440,17 +450,13 @@ public class CgformUtil {
             var5 = var4.getKey();
             var7 = var4.getValue();
             if (!"_t".equals(var5) && null != var7) {
-                if (!(var7 instanceof String[])) {
-                    var6 = var7.toString();
-                } else {
-                    String[] var8 = (String[]) var7;
+                String[] var8 = (String[]) var7;
 
-                    for(int var9 = 0; var9 < var8.length; ++var9) {
-                        var6 = var8[var9] + ",";
-                    }
-
-                    var6 = var6.substring(0, var6.length() - 1);
+                for(int var9 = 0; var9 < var8.length; ++var9) {
+                    var6 = var8[var9] + ",";
                 }
+
+                var6 = var6.substring(0, var6.length() - 1);
             } else {
                 var6 = "";
             }
@@ -683,12 +689,7 @@ public class CgformUtil {
                 }
             }
 
-            if (CAT_TREE.equals(var3.getFieldShowType())) {
-                var4 = var3.getDictText();
-                if (oConvertUtils.isNotEmpty(var4)) {
-                    var1.add(var4);
-                }
-            }
+            getCatTree(var1, var3);
         }
 
         var2 = var0.iterator();
@@ -704,6 +705,16 @@ public class CgformUtil {
         return var1;
     }
 
+    private static void getCatTree(HashSet<String> var1, OnlCgformField var3) {
+        String var4;
+        if (CAT_TREE.equals(var3.getFieldShowType())) {
+            var4 = var3.getDictText();
+            if (oConvertUtils.isNotEmpty(var4)) {
+                var1.add(var4);
+            }
+        }
+    }
+
     public static Map<String, Object> a(String var0, List<OnlCgformField> var1, JSONObject var2) {
         StringBuilder var3 = new StringBuilder();
         StringBuilder var4 = new StringBuilder();
@@ -898,48 +909,9 @@ public class CgformUtil {
 
                 if (var5) {
                     byte var11 = -1;
-                    switch(var9.hashCode()) {
-                        case -909973894:
-                            if (var9.equals(CREATE_BY)) {
-                                var11 = 0;
-                            }
-                            break;
-                        case -99751974:
-                            if (var9.equals(SYS_ORG_CODE)) {
-                                var11 = 4;
-                            }
-                            break;
-                        case 837427085:
-                            if (var9.equals(UPDATE_BY)) {
-                                var11 = 2;
-                            }
-                            break;
-                        case 1609067651:
-                            if (var9.equals(UPDATE_TIME)) {
-                                var11 = 3;
-                            }
-                            break;
-                        case 1688939568:
-                            if (var9.equals(CREATE_TIME)) {
-                                var11 = 1;
-                            }
-                            break;
-                        default:break;
-                    }
+                    var11 = getVar11(var9, var11);
 
-                    switch(var11) {
-                        case 0: case 2:
-                            var2.put(var4, var1.getUsername());
-                            return;
-                        case 1: case 3:
-                            var0.setFieldShowType(DATETIME);
-                            var2.put(var4, DateUtils.formatDateTime());
-                            return;
-                        case 4:
-                            var2.put(var4, var1.getOrgCode());
-                            break;
-                        default:break;
-                    }
+                    getVar11(var0, var1, var2, var4, var11);
                 }
                 break;
             }
@@ -947,6 +919,54 @@ public class CgformUtil {
 
     }
 
+    private static void getVar11(OnlCgformField var0, LoginUser var1, JSONObject var2, String var4, byte var11) {
+        switch(var11) {
+            case 0: case 2:
+                var2.put(var4, var1.getUsername());
+                return;
+            case 1: case 3:
+                var0.setFieldShowType(DATETIME);
+                var2.put(var4, DateUtils.formatDateTime());
+                return;
+            case 4:
+                var2.put(var4, var1.getOrgCode());
+                break;
+            default:break;
+        }
+    }
+
+    private static byte getVar11(String var9, byte var11) {
+        switch(var9.hashCode()) {
+            case -909973894:
+                if (var9.equals(CREATE_BY)) {
+                    var11 = 0;
+                }
+                break;
+            case -99751974:
+                if (var9.equals(SYS_ORG_CODE)) {
+                    var11 = 4;
+                }
+                break;
+            case 837427085:
+                if (var9.equals(UPDATE_BY)) {
+                    var11 = 2;
+                }
+                break;
+            case 1609067651:
+                if (var9.equals(UPDATE_TIME)) {
+                    var11 = 3;
+                }
+                break;
+            case 1688939568:
+                if (var9.equals(CREATE_TIME)) {
+                    var11 = 1;
+                }
+                break;
+            default:break;
+        }
+        return var11;
+    }
+
     public static boolean a(Object var0, Object var1) {
         if (oConvertUtils.isEmpty(var0) && oConvertUtils.isEmpty(var1)) {
             return true;
@@ -992,33 +1012,9 @@ public class CgformUtil {
 
             if (var6.getIsQuery() == 1) {
                 if (SINGLE.equals(var6.getQueryMode())) {
-                    if (var2.get(var7) != null) {
-                        var9 = !OnlineDbHandler.a(var8);
-                        var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9);
-                        if (!"".equals(var10)) {
-                            var3.append(AND).append(var10);
-                        }
-                    }
+                    getSingle(var2, var3, var7, var8);
                 } else {
-                    Object var11 = var2.get(var7 + "_begin");
-                    if (var11 != null) {
-                        var3.append(AND).append(var7).append(">=");
-                        if (OnlineDbHandler.a(var8)) {
-                            var3.append(var11.toString());
-                        } else {
-                            var3.append("'").append(var11.toString()).append("'");
-                        }
-                    }
-
-                    Object var12 = var2.get(var7 + "_end");
-                    if (var12 != null) {
-                        var3.append(AND).append(var7).append("<=");
-                        if (OnlineDbHandler.a(var8)) {
-                            var3.append(var12.toString());
-                        } else {
-                            var3.append("'").append(var12.toString()).append("'");
-                        }
-                    }
+                    appendVar3(var2, var3, var7, var8);
                 }
             }
         }
@@ -1026,6 +1022,40 @@ public class CgformUtil {
         return "SELECT id" + var4.toString() + FROM + f(var0) + " where 1=1  " + var3.toString();
     }
 
+    private static void appendVar3(Map<String, Object> var2, StringBuilder var3, String var7, String var8) {
+        Object var11 = var2.get(var7 + "_begin");
+        if (var11 != null) {
+            var3.append(AND).append(var7).append(">=");
+            if (OnlineDbHandler.a(var8)) {
+                var3.append(var11.toString());
+            } else {
+                var3.append("'").append(var11.toString()).append("'");
+            }
+        }
+
+        Object var12 = var2.get(var7 + "_end");
+        if (var12 != null) {
+            var3.append(AND).append(var7).append("<=");
+            if (OnlineDbHandler.a(var8)) {
+                var3.append(var12.toString());
+            } else {
+                var3.append("'").append(var12.toString()).append("'");
+            }
+        }
+    }
+
+    private static void getSingle(Map<String, Object> var2, StringBuilder var3, String var7, String var8) {
+        boolean var9;
+        String var10;
+        if (var2.get(var7) != null) {
+            var9 = !OnlineDbHandler.a(var8);
+            var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9);
+            if (!"".equals(var10)) {
+                var3.append(AND).append(var10);
+            }
+        }
+    }
+
     public static List<ExcelExportEntity> a(List<OnlCgformField> var0, String var1) {
         ArrayList<ExcelExportEntity> var2 = new ArrayList<>();
 
@@ -1034,11 +1064,7 @@ public class CgformUtil {
                 ExcelExportEntity var4 = new ExcelExportEntity(var0.get(var3).getDbFieldTxt(), var0.get(var3).getDbFieldName());
                 int s = var0.get(var3).getDbLength() > 30 ? 30 : var0.get(var3).getDbLength();
                 int var5 = var0.get(var3).getDbLength() == 0 ? 12 : s;
-                if (var0.get(var3).getFieldShowType().equals(DATE)) {
-                    var4.setFormat("yyyy-MM-dd");
-                } else if (var0.get(var3).getFieldShowType().equals(DATETIME)) {
-                    var4.setFormat("yyyy-MM-dd HH:mm:ss");
-                }
+                setFormat(var0, var3, var4);
 
                 if (var5 < 10) {
                     var5 = 10;
@@ -1052,24 +1078,22 @@ public class CgformUtil {
         return var2;
     }
 
+    private static void setFormat(List<OnlCgformField> var0, int var3, ExcelExportEntity var4) {
+        if (var0.get(var3).getFieldShowType().equals(DATE)) {
+            var4.setFormat("yyyy-MM-dd");
+        } else if (var0.get(var3).getFieldShowType().equals(DATETIME)) {
+            var4.setFormat("yyyy-MM-dd HH:mm:ss");
+        }
+    }
+
     public static boolean a(OnlCgformEnhanceJava var0) {
         String var1 = var0.getCgJavaType();
         String var2 = var0.getCgJavaValue();
         if (oConvertUtils.isNotEmpty(var2)) {
             try {
                 if ("class".equals(var1)) {
-                    Class var3 = Class.forName(var2);
-                    if (var3 == null) {
-                        return false;
-                    }
+                    Class.forName(var2);
                 }
-                // 总是false
-//                if ("spring".equals(var1)) {
-//                    Object var5 = SpringContextUtils.getBean(var2);
-//                    if (var5 == null) {
-//                        return false;
-//                    }
-//                }
             } catch (Exception var4) {
                 log.error(var4.getMessage(), var4);
                 return false;
@@ -1211,21 +1235,7 @@ public class CgformUtil {
 
             while(true) {
                 while(var3.hasNext()) {
-                    String var4 = var3.next();
-                    String var5;
-                    if (var1.get(var4.toUpperCase()) == null && var1.get(var4.toLowerCase()) == null) {
-                        var5 = QueryGenerator.converRuleValue(var4);
-                        var0 = var0.replace("#{" + var4 + "}", var5);
-                    } else {
-                        var5 = null;
-                        if (var1.containsKey(var4.toLowerCase())) {
-                            var5 = var1.getString(var4.toLowerCase());
-                        } else if (var1.containsKey(var4.toUpperCase())) {
-                            var5 = var1.getString(var4.toUpperCase());
-                        }
-
-                        var0 = var0.replace("#{" + var4 + "}", var5);
-                    }
+                    var0 = getString(var0, var1, var3);
                 }
 
                 return var0;
@@ -1233,6 +1243,26 @@ public class CgformUtil {
         }
     }
 
+    @NotNull
+    private static String getString(String var0, JSONObject var1, Iterator<String> var3) {
+        String var4 = var3.next();
+        String var5;
+        if (var1.get(var4.toUpperCase()) == null && var1.get(var4.toLowerCase()) == null) {
+            var5 = QueryGenerator.converRuleValue(var4);
+            var0 = var0.replace("#{" + var4 + "}", var5);
+        } else {
+            var5 = null;
+            if (var1.containsKey(var4.toLowerCase())) {
+                var5 = var1.getString(var4.toLowerCase());
+            } else if (var1.containsKey(var4.toUpperCase())) {
+                var5 = var1.getString(var4.toUpperCase());
+            }
+
+            var0 = var0.replace("#{" + var4 + "}", var5);
+        }
+        return var0;
+    }
+
     public static String c(String var0, List<OnlCgformButton> var1) {
         var0 = d(var0, var1);
         String[] var2 = "beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created".split(",");
@@ -1305,7 +1335,7 @@ public class CgformUtil {
                     }
                 }
             }
-
+            log.info(var3 + "");
             var0.setCgJs(var4);
             a(var0);
             a(var0, var1, var2);
@@ -1337,27 +1367,7 @@ public class CgformUtil {
                 while(var2.hasNext()) {
                     OnlCgformButton var3 = var2.next();
                     String var4 = var3.getButtonCode();
-                    Pattern var5;
-                    Matcher var6;
-                    if ("link".equals(var3.getButtonStyle())) {
-                        var5 = Pattern.compile("(" + var4 + "\\s*\\(row\\)\\s*\\{)");
-                        var6 = var5.matcher(var0);
-                        if (var6.find()) {
-                            var0 = var0.replace(var6.group(0), var4 + "(that,row){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;");
-                        } else {
-                            Pattern var7 = Pattern.compile("(" + var4 + S_S);
-                            Matcher var8 = var7.matcher(var0);
-                            if (var8.find()) {
-                                var0 = var0.replace(var8.group(0), var4 + THAT_1);
-                            }
-                        }
-                    } else if ("button".equals(var3.getButtonStyle()) || "form".equals(var3.getButtonStyle())) {
-                        var5 = Pattern.compile("(" + var4 + S_S);
-                        var6 = var5.matcher(var0);
-                        if (var6.find()) {
-                            var0 = var0.replace(var6.group(0), var4 + THAT_1);
-                        }
-                    }
+                    var0 = getString(var0, var3, var4);
                 }
 
                 return var0;
@@ -1367,6 +1377,31 @@ public class CgformUtil {
         }
     }
 
+    private static String getString(String var0, OnlCgformButton var3, String var4) {
+        Pattern var5;
+        Matcher var6;
+        if ("link".equals(var3.getButtonStyle())) {
+            var5 = Pattern.compile("(" + var4 + "\\s*\\(row\\)\\s*\\{)");
+            var6 = var5.matcher(var0);
+            if (var6.find()) {
+                var0 = var0.replace(var6.group(0), var4 + "(that,row){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;");
+            } else {
+                Pattern var7 = Pattern.compile("(" + var4 + S_S);
+                Matcher var8 = var7.matcher(var0);
+                if (var8.find()) {
+                    var0 = var0.replace(var8.group(0), var4 + THAT_1);
+                }
+            }
+        } else if ("button".equals(var3.getButtonStyle()) || "form".equals(var3.getButtonStyle())) {
+            var5 = Pattern.compile("(" + var4 + S_S);
+            var6 = var5.matcher(var0);
+            if (var6.find()) {
+                var0 = var0.replace(var6.group(0), var4 + THAT_1);
+            }
+        }
+        return var0;
+    }
+
     public static JSONArray a(List<OnlCgformField> var0, List<String> var1) {
         JSONArray var2 = new JSONArray();
         ISysBaseAPI var3 = SpringContextUtils.getBean(ISysBaseAPI.class);
@@ -1397,80 +1432,96 @@ public class CgformUtil {
             var7.put("key", var6);
             String var8 = c(var5);
             var7.put("type", var8);
-            if (var5.getFieldLength() == null) {
-                var7.put(WIDTH, "186px");
-            } else if (!SEL_DEPART.equals(var8) && !SEL_USER.equals(var8)) {
-                var7.put(WIDTH, var5.getFieldLength() + "px");
-            } else {
-                var7.put(WIDTH, "");
-            }
+            putVar7(var5, var7, var8);
 
             if ("file".equals(var8) || IMAGE.equals(var8)) {
                 var7.put("responseName", MESSAGE);
                 var7.put("token", true);
             }
 
-            if (var8.equals(SWITCH)) {
-                var7.put("type", CHECKBOX);
-                JSONArray var9 = new JSONArray();
-                if (oConvertUtils.isEmpty(var5.getFieldExtendJson())) {
-                    var9.add("Y");
-                    var9.add("N");
-                } else {
-                    var9 = JSON.parseArray(var5.getFieldExtendJson());
-                }
+            getSwitch(var5, var7, var8);
 
-                var7.put("customValue", var9);
-            }
-
-            if (var8.equals(POPUP)) {
-                var7.put("popupCode", var5.getDictTable());
-                var7.put("orgFields", var5.getDictField());
-                var7.put("destFields", var5.getDictText());
-                String var17 = var5.getDictText();
-                if (var17 != null && !"".equals(var17)) {
-                    ArrayList<String> var10 = new ArrayList<>();
-                    String[] var11 = var17.split(",");
-                    String[] var12 = var11;
-                    int var13 = var11.length;
-
-                    for(int var14 = 0; var14 < var13; ++var14) {
-                        String var15 = var12[var14];
-                        if (!a(var15, var0)) {
-                            var10.add(var15);
-                            JSONObject var16 = new JSONObject();
-                            var16.put("title", var15);
-                            var16.put("key", var15);
-                            var16.put("type", "hidden");
-                            var2.add(var16);
-                        }
-                    }
-                }
-            }
+            getPopUp(var0, var2, var5, var7, var8);
 
             var7.put("defaultValue", var5.getDbDefaultVal());
             var7.put("fieldDefaultValue", var5.getFieldDefaultValue());
             var7.put("placeholder", "请输入" + var5.getDbFieldTxt());
             var7.put("validateRules", b(var5));
-            if ("list".equals(var5.getFieldShowType()) || RADIO.equals(var5.getFieldShowType()) || "checkbox_meta".equals(var5.getFieldShowType()) || LIST_MULTI.equals(var5.getFieldShowType()) || SEL_SEARCH.equals(var5.getFieldShowType())) {
-                Object var18 = new ArrayList<>();
-                if (oConvertUtils.isNotEmpty(var5.getDictTable())) {
-                    var18 = var3.queryTableDictItemsByCode(var5.getDictTable(), var5.getDictText(), var5.getDictField());
-                } else if (oConvertUtils.isNotEmpty(var5.getDictField())) {
-                    var18 = var3.queryDictItemsByCode(var5.getDictField());
-                }
-
-                var7.put("options", var18);
-                if (LIST_MULTI.equals(var5.getFieldShowType())) {
-                    var7.put(WIDTH, "230px");
-                }
-            }
+            getRadIo(var3, var5, var7);
 
             var7.put("fieldExtendJson", var5.getFieldExtendJson());
             var2.add(var7);
         }
     }
 
+    private static void putVar7(OnlCgformField var5, JSONObject var7, String var8) {
+        if (var5.getFieldLength() == null) {
+            var7.put(WIDTH, "186px");
+        } else if (!SEL_DEPART.equals(var8) && !SEL_USER.equals(var8)) {
+            var7.put(WIDTH, var5.getFieldLength() + "px");
+        } else {
+            var7.put(WIDTH, "");
+        }
+    }
+
+    private static void getSwitch(OnlCgformField var5, JSONObject var7, String var8) {
+        if (var8.equals(SWITCH)) {
+            var7.put("type", CHECKBOX);
+            JSONArray var9 = new JSONArray();
+            if (oConvertUtils.isEmpty(var5.getFieldExtendJson())) {
+                var9.add("Y");
+                var9.add("N");
+            } else {
+                var9 = JSON.parseArray(var5.getFieldExtendJson());
+            }
+
+            var7.put("customValue", var9);
+        }
+    }
+
+    private static void getRadIo(ISysBaseAPI var3, OnlCgformField var5, JSONObject var7) {
+        if ("list".equals(var5.getFieldShowType()) || RADIO.equals(var5.getFieldShowType()) || "checkbox_meta".equals(var5.getFieldShowType()) || LIST_MULTI.equals(var5.getFieldShowType()) || SEL_SEARCH.equals(var5.getFieldShowType())) {
+            Object var18 = new ArrayList<>();
+            if (oConvertUtils.isNotEmpty(var5.getDictTable())) {
+                var18 = var3.queryTableDictItemsByCode(var5.getDictTable(), var5.getDictText(), var5.getDictField());
+            } else if (oConvertUtils.isNotEmpty(var5.getDictField())) {
+                var18 = var3.queryDictItemsByCode(var5.getDictField());
+            }
+
+            var7.put("options", var18);
+            if (LIST_MULTI.equals(var5.getFieldShowType())) {
+                var7.put(WIDTH, "230px");
+            }
+        }
+    }
+
+    private static void getPopUp(List<OnlCgformField> var0, JSONArray var2, OnlCgformField var5, JSONObject var7, String var8) {
+        if (var8.equals(POPUP)) {
+            var7.put("popupCode", var5.getDictTable());
+            var7.put("orgFields", var5.getDictField());
+            var7.put("destFields", var5.getDictText());
+            String var17 = var5.getDictText();
+            if (var17 != null && !"".equals(var17)) {
+                ArrayList<String> var10 = new ArrayList<>();
+                String[] var11 = var17.split(",");
+                String[] var12 = var11;
+                int var13 = var11.length;
+
+                for(int var14 = 0; var14 < var13; ++var14) {
+                    String var15 = var12[var14];
+                    if (!a(var15, var0)) {
+                        var10.add(var15);
+                        JSONObject var16 = new JSONObject();
+                        var16.put("title", var15);
+                        var16.put("key", var15);
+                        var16.put("type", "hidden");
+                        var2.add(var16);
+                    }
+                }
+            }
+        }
+    }
+
     private static JSONArray b(OnlCgformField var0) {
         JSONArray var1 = new JSONArray();
         JSONObject var2;
@@ -1507,25 +1558,12 @@ public class CgformUtil {
             for(Iterator<String> var3 = var2.iterator(); var3.hasNext(); var1.put(var9, var5 == null ? "" : var5)) {
                 String var4 = var3.next();
                 var5 = var0.get(var4);
-                if (var5 instanceof Clob) {
-                    var5 = a((Clob)var5);
-                } else if (var5 instanceof byte[]) {
-                    var5 = new String((byte[])var5);
-                } else if (var5 instanceof Blob) {
-                    try {
-                        Blob var6 = (Blob)var5;
-                        var5 = new String(var6.getBytes(1L, (int)var6.length()), StandardCharsets.UTF_8);
-                    } catch (Exception var8) {
-                        var8.printStackTrace();
-                    }
-                }
+                var5 = getObject(var5);
 
                 var9 = var4.toLowerCase();
                 if (var5 instanceof String) {
                     String var7 = var5.toString();
-                    if (var7.startsWith("[") && var7.endsWith("]")) {
-                        var5 = JSON.parseArray(var7);
-                    }
+                    var5 = getObject(var5, var7);
                 }
             }
 
@@ -1535,6 +1573,13 @@ public class CgformUtil {
         }
     }
 
+    private static Object getObject(Object var5, String var7) {
+        if (var7.startsWith("[") && var7.endsWith("]")) {
+            var5 = JSON.parseArray(var7);
+        }
+        return var5;
+    }
+
     public static JSONObject a(JSONObject var0) {
         if (!DbTableUtil.a()) {
             return var0;
@@ -1557,39 +1602,22 @@ public class CgformUtil {
 
     public static List<Map<String, Object>> d(List<Map<String, Object>> var0) {
         ArrayList<Map<String, Object>> var1 = new ArrayList<>();
-        Iterator<Map<String, Object>> var2 = var0.iterator();
 
-        while(var2.hasNext()) {
-            Map<String, Object> var3 = var2.next();
+        for (Map<String, Object> var3 : var0) {
             HashMap<String, Object> var4 = new HashMap<>();
             Set<String> var5 = var3.keySet();
 
             Object var8;
             String var12;
-            for(Iterator<String> var6 = var5.iterator(); var6.hasNext(); var4.put(var12, var8 == null ? "" : var8)) {
+            for (Iterator<String> var6 = var5.iterator(); var6.hasNext(); var4.put(var12, var8 == null ? "" : var8)) {
                 String var7 = var6.next();
                 var8 = var3.get(var7);
-                if (var8 instanceof Clob) {
-                    var8 = a((Clob)var8);
-                } else if (var8 instanceof byte[]) {
-                    var8 = new String((byte[])var8);
-                } else if (var8 instanceof Blob) {
-                    try {
-                        if (var8 != null) {
-                            Blob var9 = (Blob)var8;
-                            var8 = new String(var9.getBytes(1L, (int)var9.length()), StandardCharsets.UTF_8);
-                        }
-                    } catch (Exception var11) {
-                        var11.printStackTrace();
-                    }
-                }
+                var8 = getObject(var8);
 
                 var12 = var7.toLowerCase();
                 if (var8 instanceof String) {
                     String var10 = var8.toString();
-                    if (var10.startsWith("[") && var10.endsWith("]")) {
-                        var8 = JSON.parseArray(var10);
-                    }
+                    var8 = getObject(var8, var10);
                 }
             }
 
@@ -1599,6 +1627,22 @@ public class CgformUtil {
         return var1;
     }
 
+    private static Object getObject(Object var8) {
+        if (var8 instanceof Clob) {
+            var8 = a((Clob) var8);
+        } else if (var8 instanceof byte[]) {
+            var8 = new String((byte[]) var8);
+        } else if (var8 instanceof Blob) {
+            try {
+                Blob var9 = (Blob) var8;
+                var8 = new String(var9.getBytes(1L, (int) var9.length()), StandardCharsets.UTF_8);
+            } catch (Exception var11) {
+                var11.printStackTrace();
+            }
+        }
+        return var8;
+    }
+
     public static String a(Clob var0) {
         String var1 = "";
 
@@ -1624,10 +1668,8 @@ public class CgformUtil {
 
         try {
             var5 = DbTableUtil.getDatabaseType();
-        } catch (SQLException var14) {
+        } catch (SQLException | DBException var14) {
             var14.printStackTrace();
-        } catch (DBException var15) {
-            var15.printStackTrace();
         }
 
         HashMap<String, Object> var6 = new HashMap<>();
@@ -1685,10 +1727,8 @@ public class CgformUtil {
 
         try {
             var5 = DbTableUtil.getDatabaseType();
-        } catch (SQLException var11) {
+        } catch (SQLException | DBException var11) {
             var11.printStackTrace();
-        } catch (DBException var12) {
-            var12.printStackTrace();
         }
 
         LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal();
@@ -1701,21 +1741,7 @@ public class CgformUtil {
                 while(var7.hasNext()) {
                     OnlCgformField var8 = var7.next();
                     String var9 = var8.getDbFieldName();
-                    if (null == var9) {
-                        log.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
-                    } else if (!"id".equals(var9) && (var2.get(var9) != null || UPDATE_BY.equalsIgnoreCase(var9) || UPDATE_TIME.equalsIgnoreCase(var9) || SYS_ORG_CODE.equalsIgnoreCase(var9))) {
-                        a(var8, var6, var2, UPDATE_BY, UPDATE_TIME, SYS_ORG_CODE);
-                        String var10;
-                        if ("".equals(var2.get(var9))) {
-                            var10 = var8.getDbType();
-                            if (OnlineDbHandler.a(var10) || OnlineDbHandler.b(var10)) {
-                                continue;
-                            }
-                        }
-
-                        var10 = OnlineDbHandler.a(var5, var8, var2, var4);
-                        var3.append(var9).append("=").append(var10).append(",");
-                    }
+                    appendString(var2, var3, var4, var5, var6, var8, var9);
                 }
 
                 String var13 = var3.toString();
@@ -1731,6 +1757,24 @@ public class CgformUtil {
         }
     }
 
+    private static void appendString(JSONObject var2, StringBuilder var3, HashMap<String, Object> var4, String var5, LoginUser var6, OnlCgformField var8, String var9) {
+        if (null == var9) {
+            log.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
+        } else if (!"id".equals(var9) && (var2.get(var9) != null || UPDATE_BY.equalsIgnoreCase(var9) || UPDATE_TIME.equalsIgnoreCase(var9) || SYS_ORG_CODE.equalsIgnoreCase(var9))) {
+            a(var8, var6, var2, UPDATE_BY, UPDATE_TIME, SYS_ORG_CODE);
+            String var10;
+            if ("".equals(var2.get(var9))) {
+                var10 = var8.getDbType();
+                if (OnlineDbHandler.a(var10) || OnlineDbHandler.b(var10)) {
+                    return;
+                }
+            }
+
+            var10 = OnlineDbHandler.a(var5, var8, var2, var4);
+            var3.append(var9).append("=").append(var10).append(",");
+        }
+    }
+
     public static Map<String, Object> a(String var0, String var1, String var2) {
         HashMap<String, Object> var3 = new HashMap<>();
         String var4 = UPDATE + f(var0) + SET + var1 + "=" + "'" + 0 + "'" + WHERE + "id" + "=" + "'" + var2 + "'";
@@ -1744,7 +1788,7 @@ public class CgformUtil {
     }
 
     public static String f(String var0) {
-        return Pattern.matches("^[a-zA-z].*\\$\\d+$", var0) ? var0.substring(0, var0.lastIndexOf("$")) : var0;
+        return Pattern.matches("^[a-zA-Z].*\\$\\d+$", var0) ? var0.substring(0, var0.lastIndexOf("$")) : var0;
     }
 
     public static void a(LinkDownProperty var0, List<OnlCgformField> var1, List<String> var2) {
@@ -1754,35 +1798,29 @@ public class CgformUtil {
         ArrayList<BaseColumn> var6 = new ArrayList<>();
         if (oConvertUtils.isNotEmpty(var5)) {
             String[] var7 = var5.split(",");
-            Iterator<OnlCgformField> var8 = var1.iterator();
+            for (OnlCgformField onlCgformField : var1) {
+                String var10 = onlCgformField.getDbFieldName();
+                String[] var11 = var7;
+                int var12 = var7.length;
 
-            label26:
-            while(true) {
-                while(true) {
-                    if (!var8.hasNext()) {
-                        break label26;
-                    }
-
-                    OnlCgformField var9 = var8.next();
-                    String var10 = var9.getDbFieldName();
-                    String[] var11 = var7;
-                    int var12 = var7.length;
-
-                    for(int var13 = 0; var13 < var12; ++var13) {
-                        String var14 = var11[var13];
-                        if (var14.equals(var10)) {
-                            var2.add(var10);
-                            var6.add(new BaseColumn(var9.getDbFieldTxt(), var10));
-                            break;
-                        }
-                    }
-                }
+                doAddString(var2, var6, onlCgformField, var10, var11, var12);
             }
         }
 
         var0.setOtherColumns(var6);
     }
 
+    private static void doAddString(List<String> var2, ArrayList<BaseColumn> var6, OnlCgformField var9, String var10, String[] var11, int var12) {
+        for(int var13 = 0; var13 < var12; ++var13) {
+            String var14 = var11[var13];
+            if (var14.equals(var10)) {
+                var2.add(var10);
+                var6.add(new BaseColumn(var9.getDbFieldTxt(), var10));
+                break;
+            }
+        }
+    }
+
     public static String a(byte[] var0, String var1, String var2, String var3) {
         return CommonUtils.uploadOnlineImage(var0, var1, var2, var3);
     }
@@ -1856,20 +1894,25 @@ public class CgformUtil {
         } else if (SEL_DEPART.equals(var0.getFieldShowType())) {
             return SEL_DEPART;
         } else if (!IMAGE.equals(var0.getFieldShowType()) && !"file".equals(var0.getFieldShowType()) && !RADIO.equals(var0.getFieldShowType()) && !POPUP.equals(var0.getFieldShowType()) && !LIST_MULTI.equals(var0.getFieldShowType()) && !SEL_SEARCH.equals(var0.getFieldShowType())) {
-            if (DATETIME.equals(var0.getFieldShowType())) {
-                return DATETIME;
-            } else if (DATE.equals(var0.getFieldShowType())) {
-                return DATE;
-            } else if ("int".equals(var0.getDbType())) {
-                return "inputNumber";
-            } else {
-                return !"double".equals(var0.getDbType()) && !"BigDecimal".equals(var0.getDbType()) ? "input" : "inputNumber";
-            }
+            return getReturnString(var0);
         } else {
             return var0.getFieldShowType();
         }
     }
 
+    @NotNull
+    private static String getReturnString(OnlCgformField var0) {
+        if (DATETIME.equals(var0.getFieldShowType())) {
+            return DATETIME;
+        } else if (DATE.equals(var0.getFieldShowType())) {
+            return DATE;
+        } else if ("int".equals(var0.getDbType())) {
+            return "inputNumber";
+        } else {
+            return !"double".equals(var0.getDbType()) && !"BigDecimal".equals(var0.getDbType()) ? "input" : "inputNumber";
+        }
+    }
+
     private static String getDatabseType() {
         if (oConvertUtils.isNotEmpty(databaseType)) {
             return databaseType;