From 66a8d5793d99ce787b8ae7677f2e2b7b5d751455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 2 Aug 2023 12:25:36 +0800
Subject: [PATCH] :bug:fix bug

---
 ZR.Admin.WebApi/Extensions/DbExtension.cs          | 2 +-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 555fe0b..54910f9 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -125,7 +125,7 @@ namespace ZR.Admin.WebApi.Extensions
                         SqlDiffLog log = new()
                         {
                             BeforeData = pars,
-                            BusinessData = data.ToString(),
+                            BusinessData = data?.ToString(),
                             DiffType = diffType.ToString(),
                             Sql = sql,
                             TableName = item.TableName,
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 88648aa..157d2e9 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -390,6 +390,7 @@ $if(sub)
 $foreach(column in genTable.SubTable.Columns)
 $set(labelName = column.ColumnComment)
 $set(columnName = column.CsharpFieldFl)
+$set(value = "item.dictValue")
 $if(column.CsharpType == "int" || column.CsharpType == "long")
 $set(value = "parseInt(item.dictValue)")
 $set(number = ".number")
@@ -425,7 +426,7 @@ $elseif(column.HtmlType == "switch")
           <el-table-column label="${labelName}" prop="${columnName}">
             <template #default="scope">
               <el-switch v-model="scope.row.${columnName}" ${switchType} />
-            <template #default="scope">
+            </template>
           </el-table-column>
 $else
           <el-table-column label="${labelName}" align="center" prop="${columnName}">
@@ -792,6 +793,7 @@ const handleFileSuccess = (response) => {
   proxy.${alert}alert(item1 + '<p>' + error + '</p>', '导入结果', {
     dangerouslyUseHTMLString: true
   })
+  getList()
 }
 $end