estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复LIKE查询下的模板bug

Browse Source 
fix: 在模板模式下对AI进行disabled
This commit is contained in:
pixelmaxQM
2024-10-28 21:39:40 +08:00
parent bb6c0be9de
commit 4f8030ecae
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/resource/package/server/service/service.go.tpl
View File

@@ -13,7 +13,7 @@
{{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }} {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
if info.{{.FieldName}} != "" { if info.{{.FieldName}} != "" {
{{- if or (eq .FieldType "enum") }} {{- if or (eq .FieldType "enum") }}
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
{{- else}} {{- else}}
// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务 // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
{{- end}} {{- end}}
@@ -24,7 +24,7 @@ if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
} }
{{- else}} {{- else}}
if info.{{.FieldName}} != nil { if info.{{.FieldName}} != nil {
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
} }
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -148,7 +148,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
{{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }} {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
if info.{{.FieldName}} != "" { if info.{{.FieldName}} != "" {
{{- if or (eq .FieldType "enum")}} {{- if or (eq .FieldType "enum")}}
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
{{- else}} {{- else}}
// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务 // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
{{- end}} {{- end}}
@@ -159,7 +159,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
} }
{{- else}} {{- else}}
if info.{{.FieldName}} != nil { if info.{{.FieldName}} != nil {
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
} }
{{- end }} {{- end }}
{{- end }} {{- end }}

8
server/resource/plugin/server/service/service.go.template
View File

@@ -13,7 +13,7 @@
{{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }} {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
if info.{{.FieldName}} != "" { if info.{{.FieldName}} != "" {
{{- if or (eq .FieldType "enum") }} {{- if or (eq .FieldType "enum") }}
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
{{- else}} {{- else}}
// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务 // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
{{- end}} {{- end}}
@@ -24,7 +24,7 @@ if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
} }
{{- else}} {{- else}}
if info.{{.FieldName}} != nil { if info.{{.FieldName}} != nil {
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
} }
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -156,7 +156,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
{{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }} {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
if info.{{.FieldName}} != "" { if info.{{.FieldName}} != "" {
{{- if or (eq .FieldType "enum")}} {{- if or (eq .FieldType "enum")}}
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
{{- else}} {{- else}}
// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务 // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
{{- end}} {{- end}}
@@ -167,7 +167,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
} }
{{- else}} {{- else}}
if info.{{.FieldName}} != nil { if info.{{.FieldName}} != nil {
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
} }
{{- end }} {{- end }}
{{- end }} {{- end }}

4
web/src/view/systemTools/autoCode/index.vue
View File

@@ -22,7 +22,7 @@
<template #content> <template #content>
<div>【完全免费】前往<a class="text-blue-600" href="https://plugin.gin-vue-admin.com/#/layout/userInfo/center" target="_blank">插件市场个人中心</a>申请AIPath，填入config.yaml的ai-path属性即可使用。</div> <div>【完全免费】前往<a class="text-blue-600" href="https://plugin.gin-vue-admin.com/#/layout/userInfo/center" target="_blank">插件市场个人中心</a>申请AIPath，填入config.yaml的ai-path属性即可使用。</div>
</template> </template>
<el-button type="primary" @click="llmAutoFunc()"> <el-button :disabled="form.onlyTemplate" type="primary" @click="llmAutoFunc()">
<el-icon size="18"> <el-icon size="18">
<ai-gva /> <ai-gva />
</el-icon> 生成 </el-icon> 生成
@@ -163,7 +163,7 @@
v-model="form.structName" v-model="form.structName"
placeholder="首字母自动转换大写" placeholder="首字母自动转换大写"
/> />
<el-button type="primary" @click="llmAutoFunc(true)"> <el-button :disabled="form.onlyTemplate" type="primary" @click="llmAutoFunc(true)">
<el-icon size="18"> <el-icon size="18">
<ai-gva /> <ai-gva />
</el-icon> 生成 </el-icon> 生成