角色保存修改

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

@@ -96,10 +96,8 @@ public interface RoleInfoRepository extends JpaRepository<RoleInfo, Integer> {
 
     @Modifying
     @Query(nativeQuery = true,
-        value = "with t1 as (delete from role_authority where role_id = :roleId and authority_id not in :authorityIds)" +
-                "insert into role_authority(role_id, authority_id) " +
-                "select :roleId, authority_id from authority_info where authority_id in :authorityIds " +
-                "on conflict (role_id, authority_id) do nothing "
+        value = "insert into role_authority(role_id, authority_id) " +
+                "select :roleId, authority_id from authority_info where authority_id in :authorityIds "
     )
     void updateRoleAuthority(@Param("roleId") Integer roleId,
                              @Param("authorityIds") List<Integer> authorityIds);
@@ -131,4 +129,10 @@ public interface RoleInfoRepository extends JpaRepository<RoleInfo, Integer> {
         value = "select string_agg(role_name, ',') from role_info where role_id in :hasUserRoleIds"
     )
     String findHasUserRoleNames(@Param("hasUserRoleIds") List<Integer> hasUserRoleIds);
+
+    @Modifying
+    @Query(nativeQuery = true,
+        value = "delete from role_authority where role_id = :roleId"
+    )
+    void deleteByRoleId(@Param("roleId") Integer roleId);
 }

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

@@ -69,6 +69,7 @@ public class RoleInfoService {
             roleInfoRepository.save(oldRole);
         }
 
+        roleInfoRepository.deleteByRoleId(roleInfo.getRoleId());
         roleInfoRepository.updateRoleAuthority(roleInfo.getRoleId(), authorityIds);
         return null;
     }

src/main/java/com/lqkj/link/module/zone/repository/MaterialInfoRepository.java

@@ -44,7 +44,7 @@ public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Inte
                     "(:materialName = '' or material_name like concat('%', :materialName, '%')) " +
                     "and (:materialType is null or material_type = :materialType) " +
                     "and (:userId is null or user_id = :userId) " +
-                    "order by update_time"
+                    "order by update_time desc"
     )
     Page<MaterialInfo> pageQuery(@Param("materialName") String materialName,
                                  @Param("materialType") Integer materialType,