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

# Conflicts:
#	src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java

src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java

@@ -25,7 +25,7 @@ public class ColumnMetaData {
         /**
          * 字段长度
          */
-        private Integer characterMaximumLength;
+        private Long characterMaximumLength;
 
         /**
          * 是否主键(1-是 0-否)

src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java

@@ -40,7 +40,7 @@ public class GenFieldConfig extends BaseEntity {
     /**
      * 字段长度
      */
-    private Integer maxLength;
+    private Long maxLength;
 
     /**
      * 字段名称
@@ -103,4 +103,4 @@ public class GenFieldConfig extends BaseEntity {
      * 字典类型
      */
     private String dictType;
-}
+}

src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java

@@ -27,7 +27,7 @@ public class UserPageQuery extends BasePageQuery {
     @Schema(description="部门ID")
     private Long deptId;
 
-    @Schema(description = "角色ID")
+    @Schema(description="角色ID")
     private List<Long> roleIds;
 
     @Schema(description="创建时间范围")

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

@@ -37,6 +37,12 @@
             <if test='queryParams.deptId!=null'>
                 AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
             </if>
+            <if test='queryParams.roleIds!=null and queryParams.roleIds.size > 0'>
+                AND sur.role_id in
+                <foreach collection="queryParams.roleIds" item="roleId" open="(" close=")" separator=",">
+                    #{roleId}
+                </foreach>
+            </if>
             <if test="queryParams.createTime != null and queryParams.createTime.size > 0">
                 <if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''">
                     <bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>