同步ruoyi-vue更新

ruoyi/src/main/resources/application.yml

@@ -116,6 +116,10 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql 
 
+# Swagger配置
+swagger:
+  enable: true
+
 # 防止XSS攻击
 xss: 
   # 过滤开关

ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${dataScope}
+		order by r.role_sort
 	</select>
     
 	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">

ruoyi/src/main/resources/vm/vue/index-tree.vue.vm

@@ -146,7 +146,8 @@
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="dict.dictValue"
+              #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -162,7 +163,8 @@
             <el-radio
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
-              :label="dict.dictValue"
+              #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>

ruoyi/src/main/resources/vm/vue/index.vue.vm

@@ -174,7 +174,8 @@
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="dict.dictValue"
+              #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -190,7 +191,8 @@
             <el-radio
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
-              :label="dict.dictValue"
+              #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>