From 69493bc7f79b6ac93c706add5237d72da1e05368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Tue, 23 Mar 2021 13:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E6=A1=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=A0=BC=E5=BC=8F=EF=BC=88=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=A0=E9=BB=84=E6=B3=A2=E6=B5=AA?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/components/UserSelect/UserSelect.vue |  2 +-
 .../main/resources/template/addForm.vue.vm    | 20 +++++++++----------
 .../main/resources/template/editForm.vue.vm   | 20 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/_web/src/components/UserSelect/UserSelect.vue b/_web/src/components/UserSelect/UserSelect.vue
index dc1e4e46..c38a54bf 100644
--- a/_web/src/components/UserSelect/UserSelect.vue
+++ b/_web/src/components/UserSelect/UserSelect.vue
@@ -57,7 +57,7 @@ export default {
       this.userFetching = true
 
       getUserPage(params).then((res) => {
-        this.data = res.rows.map(user => ({
+        this.data = res.data.rows.map(user => ({
           text: `${user.name} ${user.account}`,
           value: user.id
         }))
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
index 1a2f62ea..dc437d04 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
@@ -27,18 +27,18 @@
         >
 #end
 #if (${column.effectType} == "user")
-    #if (${column.whetherRequired} == "Y")
-      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
-    #else
-      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
-    #end
+#if (${column.whetherRequired} == "Y")
+          <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+#else
+          <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+#end
 #end
 #if (${column.effectType} == "depart")
-    #if (${column.whetherRequired} == "Y")
-      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
-    #else
-      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
-    #end
+#if (${column.whetherRequired} == "Y")
+          <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+#else
+          <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+#end
 #end
 #if (${column.effectType} == "input")
 #if (${column.whetherRequired} == "Y")
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
index 7c7b944a..6a36c328 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
@@ -29,18 +29,18 @@
         >
 #end
 #if (${column.effectType} == "user")
-    #if (${column.whetherRequired} == "Y")
-      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
-    #else
-      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
-    #end
+#if (${column.whetherRequired} == "Y")
+          <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+#else
+          <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+#end
 #end
 #if (${column.effectType} == "depart")
-    #if (${column.whetherRequired} == "Y")
-      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
-    #else
-      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
-    #end
+#if (${column.whetherRequired} == "Y")
+          <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+#else
+          <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+#end
 #end
 #if (${column.effectType} == "input")
 #if (${column.whetherRequired} == "Y")