Browse Source

fix 修改查询方式

Administrator 3 years ago
parent
commit
249c31fa2f

+ 7 - 6
boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -52,7 +52,8 @@ public class TableSqlServiceImpl implements ITableSqlService {
         }
         GenTable genTable = genTableMapper.selectGenTableById(tableSql.getTableId());
         String tableName = genTable.getTableName();
-        tableSql.setCreateSql(createSql(tableSql, tableName));
+        String tableComment = genTable.getTableComment();
+        tableSql.setCreateSql(createSql(tableSql, tableComment));
         tableSql.setCreateBy(SecurityUtils.getUsername());
         tableSql.setCreateLog(DateUtils.getTime() + " " + SecurityUtils.getUsername() + " 创建表 " + tableName);
         tableSqlMapper.insertTableSql(tableSql);
@@ -68,8 +69,8 @@ public class TableSqlServiceImpl implements ITableSqlService {
     @Override
     public AjaxResult reloadTableSql(TableSql tableSql) {
         GenTable genTable = genTableMapper.selectGenTableById(tableSql.getTableId());
-        String tableName = genTable.getTableName();
-        tableSql.setCreateSql(createSql(tableSql, tableName));
+        String tableComment = genTable.getTableComment();
+        tableSql.setCreateSql(createSql(tableSql, tableComment));
         String createLog = tableSql.getCreateLog();
         StringBuffer sb = new StringBuffer(createLog);
         sb.append("\r\n").append(DateUtils.getTime()).append(" ").append(SecurityUtils.getUsername()).append("刷新创建语句");
@@ -137,17 +138,17 @@ public class TableSqlServiceImpl implements ITableSqlService {
      * 生成建表语句
      *
      * @param tableSql
-     * @param tableName
+     * @param tableComment
      * @return
      */
-    private String createSql(TableSql tableSql, String tableName) {
+    private String createSql(TableSql tableSql, String tableComment) {
         //根据表id查询所有字段
         List<GenTableColumn> genTableColumns = genTableColumnMapper.selectGenTableColumnListByTableId(tableSql.getTableId());
         //定义主键id
         String primaryKey = null;
         //拼接建表语句
         StringBuffer sb = new StringBuffer("create table if not exists ");
-        String trimName = StringUtils.trim(tableName);
+        String trimName = StringUtils.trim(tableComment);
         sb.append(trimName).append(" (\r\n");
         for (GenTableColumn genTableColumn : genTableColumns) {
             if (!"HR".equals(genTableColumn.getHtmlType())){

+ 4 - 2
ruoyi-ui/src/settings.js

@@ -1,8 +1,10 @@
 module.exports = {
   title: 'OA管理系统',
-  urls: `http://118.31.23.65:7090`,
+  // urls: `http://118.31.23.65:7090`,
   // urls: `http://192.168.101.11:8090`,
-   // urls: `http://192.168.101.110:8090`,
+   urls: `http://192.168.101.110:8090`,
+
+
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light