Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

src/main/resources/application.yml

@@ -3,6 +3,8 @@ spring:
     name: youlai-boot
   profiles:
     active: dev
+project:
+  version: @project.version@
 
 # 代码生成器配置
 codegen:

src/main/resources/banner.txt

@@ -7,7 +7,7 @@ ${AnsiColor.BRIGHT_BLUE}
     |_|\___/ \__,_| |______\__,_|_|
 
 ${AnsiColor.BRIGHT_GREEN}
-YouLai Boot Version: 2.8.1
+YouLai Boot Version: ${project.version}
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 有来官网： https://www.youlai.tech/
 版权所属： 有来开源组织

src/main/resources/mapper/system/UserMapper.xml

@@ -53,6 +53,12 @@
                     AND u.create_time <= #{endDate}
                 </if>
             </if>
+            <if test="queryParams.roleIds != null and queryParams.roleIds.size() > 0">
+                AND sur.role_id IN
+                <foreach item="roleId" collection="queryParams.roleIds" open="(" separator="," close=")">
+                    #{roleId}
+                </foreach>
+            </if>
         </where>
         GROUP BY
             u.id

src/main/resources/templates/codegen/index.vue.vm

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="search-container">
+    <div class="search-bar">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
           #foreach($fieldConfig in $fieldConfigs)
               #if($fieldConfig.isShowInQuery == 1)
@@ -14,7 +14,7 @@
                       />
                     #elseif($fieldConfig.formType == "SELECT")
                         #if($fieldConfig.dictType != "")
-                          <dictionary v-model="queryParams.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
+                          <dict v-model="queryParams.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
                         #else
                           <el-select v-model="queryParams.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
                             <el-option :key="1" :value="1" label="选项一"/>
@@ -93,8 +93,8 @@
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-container">
-      <template #header>
+    <el-card shadow="never">
+      <div class="mb-10px">
         <el-button
             v-hasPerm="['${moduleName}:${lowerFirstEntityName}:add']"
             type="success"
@@ -112,7 +112,7 @@
           <template #icon><Delete /></template>
           删除
         </el-button>
-      </template>
+      </div>
 
       <el-table
           ref="dataTableRef"
@@ -187,7 +187,7 @@
                       />
                     #elseif($fieldConfig.formType == "SELECT")
                         #if($fieldConfig.dictType != "")
-                          <dictionary v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
+                          <dict v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
                         #else
                           <el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
                             <el-option :value="0" label="选项一"/>
@@ -256,7 +256,7 @@
     inheritAttrs: false,
   });
 
-  import ${entityName}API, { ${entityName}PageVO, ${entityName}Form, ${entityName}PageQuery } from "@/api/${kebabCaseEntityName}";
+  import ${entityName}API, { ${entityName}PageVO, ${entityName}Form, ${entityName}PageQuery } from "@/api/${moduleName}/${kebabCaseEntityName}";
 
   const queryFormRef = ref(ElForm);
   const dataFormRef = ref(ElForm);