fix: 修改bug

src/main/java/com/lqkj/link/module/authority/repository/RoleInfoRepository.java

@@ -118,9 +118,17 @@ public interface RoleInfoRepository extends JpaRepository<RoleInfo, Integer> {
 
     @Modifying
     @Query(nativeQuery = true,
-        value = "with t1 as(select distinct (role_id) as role_id from user_role where role_id in :roleIds)," +
-                "t2 as(delete from role_info where role_id in :roleIds and role_id not in (select role_id from t1))" +
-                "select string_agg(role_name, ',') from role_info where role_id in (select role_id from t1)"
+        value = "delete from role_info where role_id in :roleIds"
     )
-    String deleteNoUserRole(List<Integer> roleIds);
+    void deleteNoUserRole(List<Integer> roleIds);
+
+    @Query(nativeQuery = true,
+        value = "select distinct (role_id) from user_role where role_id in :roleIds"
+    )
+    List<Integer> findHasUserRole(@Param("roleIds") List<Integer> roleIds);
+
+    @Query(nativeQuery = true,
+        value = "select string_agg(role_name, ',') from role_info where role_id in :hasUserRoleIds"
+    )
+    String findHasUserRoleNames(@Param("hasUserRoleIds") List<Integer> hasUserRoleIds);
 }

src/main/java/com/lqkj/link/module/authority/service/RoleInfoService.java

@@ -97,7 +97,11 @@ public class RoleInfoService {
         return resultList;
     }
 
+    @Transactional
     public String delete(List<Integer> roleIds) {
-        return roleInfoRepository.deleteNoUserRole(roleIds);
+        List<Integer> hasUserRoleIds = roleInfoRepository.findHasUserRole(roleIds);
+        roleIds.removeAll(hasUserRoleIds);
+        roleInfoRepository.deleteNoUserRole(roleIds);
+        return roleInfoRepository.findHasUserRoleNames(hasUserRoleIds);
     }
 }