Merge branch 'master' into feature/sysconfig

src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.youlai.system.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.mapper.GenConfigMapper;
 import com.youlai.system.model.entity.GenConfig;
 import com.youlai.system.service.GenConfigService;

src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java

@@ -60,6 +60,10 @@ public class GeneratorServiceImpl implements GeneratorService {
      */
     public Page<TablePageVO> getTablePage(TablePageQuery queryParams) {
         Page<TablePageVO> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
+        // 设置排除的表
+        List<String> excludeTables = generatorProperties.getExcludeTables();
+        queryParams.setExcludeTables(excludeTables);
+
         return databaseMapper.getTablePage(page, queryParams);
     }
 

src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java

@@ -222,7 +222,18 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         return dictItemConverter.convertToOption(dictItems);
     }
 
-
+    /**
+     * 获取字典列表
+     */
+    @Override
+    public List<Option> getDictList() {
+        return this.list(new LambdaQueryWrapper<SysDict>()
+                        .eq(SysDict::getStatus, 1)
+                        .select(SysDict::getName, SysDict::getCode)
+                ).stream()
+                .map(dict -> new Option(dict.getCode(), dict.getName()))
+                .toList();
+    }
 }