From 1a6d7c0794318df06c9e079d6394c94461096da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 16 Mar 2023 18:09:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20=E7=82=B9=E9=80=89=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi-gen/src/main/resources/vm/java/bo.java.vm  | 10 +++++-----
 .../src/main/resources/vm/java/serviceImpl.java.vm   |  2 +-
 .../ruoyi-gen/src/main/resources/vm/java/vo.java.vm  |  2 +-
 .../src/main/resources/vm/vue/index-tree.vue.vm      | 10 +++++-----
 .../ruoyi-gen/src/main/resources/vm/vue/index.vue.vm | 12 ++++++------
 .../src/main/resources/vm/vue/v3/index-tree.vue.vm   | 10 +++++-----
 .../src/main/resources/vm/vue/v3/index.vue.vm        | 12 ++++++------
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm
index 3902391a..3139f821 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm
@@ -34,18 +34,18 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 public class ${ClassName}Bo extends ${Entity} {
 
 #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField) && ($column.query == 1 || $column.isInsert == 1 || $column.isEdit == 1))
+#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
     /**
      * $column.columnComment
      */
-#if($column.isInsert == 1 && $column.isEdit == 1)
+#if($column.insert && $column.edit)
 #set($Group="AddGroup.class, EditGroup.class")
-#elseif($column.isInsert == 1)
+#elseif($column.insert)
 #set($Group="AddGroup.class")
-#elseif($column.isEdit == 1)
+#elseif($column.edit)
 #set($Group="EditGroup.class")
 #end
-#if($column.isRequired == 1)
+#if($column.required)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
 #else
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
index 4e414635..ca203c1c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
@@ -66,7 +66,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
 #foreach($column in $columns)
-#if($column.query == 1)
+#if($column.query)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
 #set($javaType=$column.javaType)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm
index e7ac4155..18def71d 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm
@@ -25,7 +25,7 @@ public class ${ClassName}Vo {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isList == 1)
+#if($column.list)
     /**
      * $column.columnComment
      */
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
index af476ea7..fd07e4d7 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 #foreach($column in $columns)
-#if($column.query == 1)
+#if($column.query)
 #set($dictType=$column.dictType)
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -107,7 +107,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1)
+#if($column.pk)
 #elseif($column.list && $column.htmlType == "datetime")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
         <template slot-scope="scope">
@@ -170,7 +170,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
-#if($column.insert == 1 && !$column.pk == 1)
+#if($column.insert && !$column.pk)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -324,7 +324,7 @@ export default {
       // 查询参数
       queryParams: {
 #foreach ($column in $columns)
-#if($column.query == 1)
+#if($column.query)
         $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -334,7 +334,7 @@ export default {
       // 表单校验
       rules: {
 #foreach ($column in $columns)
-#if($column.required == 1)
+#if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
index 25a29809..7e41538e 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 #foreach($column in $columns)
-#if($column.query == 1)
+#if($column.query)
 #set($dictType=$column.dictType)
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -124,7 +124,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1)
+#if($column.pk)
       <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
 #elseif($column.list && $column.htmlType == "datetime")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@@ -185,7 +185,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
-#if($column.insert == 1 && !$column.pk == 1)
+#if($column.insert && !$column.pk)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -304,7 +304,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1 || $javaField == ${subTableFkclassName})
+#if($column.pk || $javaField == ${subTableFkclassName})
 #elseif($column.list && $column.htmlType == "input")
           <el-table-column label="$comment" prop="${javaField}" width="150">
             <template slot-scope="scope">
@@ -401,7 +401,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
 #foreach ($column in $columns)
-#if($column.query == 1)
+#if($column.query)
         $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -411,7 +411,7 @@ export default {
       // 表单校验
       rules: {
 #foreach ($column in $columns)
-#if($column.required == 1)
+#if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
index 95f82da1..4f109531 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 #foreach($column in $columns)
-#if($column.query == 1)
+#if($column.query)
 #set($dictType=$column.dictType)
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -104,7 +104,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1)
+#if($column.pk)
 #elseif($column.list && $column.htmlType == "datetime")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
         <template #default="scope">
@@ -149,7 +149,7 @@
       <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
-#if($column.insert == 1 && !$column.pk == 1)
+#if($column.insert && !$column.pk)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -298,14 +298,14 @@ const data = reactive({
   form: {},
   queryParams: {
 #foreach ($column in $columns)
-#if($column.query == 1)
+#if($column.query)
     $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
   rules: {
 #foreach ($column in $columns)
-#if($column.required == 1)
+#if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
index dba08b3c..a6bdc5b8 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 #foreach($column in $columns)
-#if($column.query == 1)
+#if($column.query)
 #set($dictType=$column.dictType)
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -119,7 +119,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1)
+#if($column.pk)
       <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
 #elseif($column.list && $column.htmlType == "datetime")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@@ -168,7 +168,7 @@
       <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
-#if($column.insert == 1 && !$column.pk == 1)
+#if($column.insert && !$column.pk)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -287,7 +287,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.pk == 1 || $javaField == ${subTableFkclassName})
+#if($column.pk || $javaField == ${subTableFkclassName})
 #elseif($column.list && $column.htmlType == "input")
           <el-table-column label="$comment" prop="${javaField}" width="150">
             <template #default="scope">
@@ -379,14 +379,14 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
 #foreach ($column in $columns)
-#if($column.query == 1)
+#if($column.query)
     $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
   rules: {
 #foreach ($column in $columns)
-#if($column.required == 1)
+#if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))