Merge branch 'dev'

auh-api/src/test/java/impl/BuildPermissionApiTest.java

@@ -37,7 +37,6 @@ public class BuildPermissionApiTest {
             String path = parent.getPath();
             String httpMethod = parent.getHttpMethod();
             String powerCodes = parent.getPowerCode();
-            String description = parent.getDescription();
 
             // 设置 powerCode
             String powerCode = Objects.isNull(powerCodes) ? "" : powerCodes;

auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateByFileDto.java

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.web.multipart.MultipartFile;
@@ -12,7 +11,6 @@ import org.springframework.web.multipart.MultipartFile;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 @Schema(name = "I18nUpdateByFileDto对象", title = "用文件更新多语言", description = "用文件更新多语言")
 public class I18nUpdateByFileDto {
 

dao/src/main/resources/mapper/system/UserRoleMapper.xml

@@ -14,37 +14,39 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, user_id, role_id, create_time, update_time, create_user, update_user, is_deleted
-    </sql>
-
     <!-- 删除这个用户id下所有的角色信息 -->
     <delete id="deleteBatchIdsByUserIds">
         delete
         from sys_user_role
-        where user_id in
+        <if test="userIds != null and !userIds.isEmpty()">
-        <foreach collection="userIds" item="id" open="(" close=")" separator=",">
+            where user_id in
-            #{id}
+            <foreach collection="userIds" item="id" open="(" close=")" separator=",">
-        </foreach>
+                #{id}
+            </foreach>
+        </if>
     </delete>
 
     <!-- 根据角色id删除用户和角色 -->
     <delete id="deleteBatchIdsByRoleIds">
         delete
         from sys_user_role
-        where role_id in
+        <if test="roleIds != null and !roleIds.isEmpty()">
-        <foreach collection="roleIds" item="id" open="(" close=")" separator=",">
+            where role_id in
-            #{id}
+            <foreach collection="roleIds" item="id" open="(" close=")" separator=",">
-        </foreach>
+                #{id}
+            </foreach>
+        </if>
     </delete>
 
     <!-- 根据角色id列表查询 -->
     <select id="selectListByRoleIds" resultType="cn.bunny.services.domain.system.system.entity.UserRole">
-        SELECT * FROM sys_user_role WHERE role_id IN
+        SELECT * FROM sys_user_role
-        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+        <if test="ids != null and !ids.isEmpty()">
-            #{id}
+            WHERE role_id IN
-        </foreach>
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java

@@ -38,6 +38,10 @@ public class ControllerApiPermissionScanner extends AbstractAnnotationScanner {
         return controllerClasses.stream()
                 .map(ControllerApiPermissionScanner::processControllerClass)
                 .filter(Objects::nonNull)
+                .peek(scannerControllerInfoVo -> {
+                    String path = scannerControllerInfoVo.getPath();
+                    scannerControllerInfoVo.setPath(path + "/**");
+                })
                 .collect(Collectors.toList());
     }