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") - - #else - - #end +#if (${column.whetherRequired} == "Y") + +#else + +#end #end #if (${column.effectType} == "depart") - #if (${column.whetherRequired} == "Y") - - #else - - #end +#if (${column.whetherRequired} == "Y") + +#else + +#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") - - #else - - #end +#if (${column.whetherRequired} == "Y") + +#else + +#end #end #if (${column.effectType} == "depart") - #if (${column.whetherRequired} == "Y") - - #else - - #end +#if (${column.whetherRequired} == "Y") + +#else + +#end #end #if (${column.effectType} == "input") #if (${column.whetherRequired} == "Y")