Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-03-21 b7f0fb8eda40b6761b35a37f72eb5e8a3c836bed

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysRoleController.java

@@ -286,6 +286,7 @@
        DataSourceContextHolder.setDataSourceKey("default");
        List<DictHosp> list = dictHospService.list();
        List<Map<String, Object>> resultList = new ArrayList<>();
        boolean flag = false;
        for (DictHosp dictHosp : list) {
            String dbName = dictHosp.getDbname();
            Map<String, Object> dbResult = new HashMap<>();
@@ -307,7 +308,7 @@
                            jdbcTemplate.execute(sql);
                            successList.add(sql);
                        } catch (Exception e) {
                            errorList.add(sql + " -> ERROR: " + e.getMessage());
                            errorList.add(sql + "\nERROR: " + e.getMessage());
                        }
                    }
                }
@@ -317,8 +318,12 @@
            dbResult.put("successSQL", successList);
            dbResult.put("failedSQL", errorList);
            resultList.add(dbResult);
            if (!errorList.isEmpty())
                flag = true;
        }
        DataSourceContextHolder.clear();
        if (flag)
            return AjaxResult.error("执行sql中存在失败",resultList);
        return AjaxResult.success(resultList);
    }