From 530e6fe3fdf9a60480cfd5b23ed820dda93cc35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Sat, 29 Oct 2022 10:02:02 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!4=20:?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81SQL=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8E=BB=E5=86=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E3=80=82'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/maku/system/dao/SysDictDataDao.java    |  8 --------
 .../net/maku/system/entity/SysDictTypeEntity.java   |  8 --------
 .../system/service/impl/SysDictTypeServiceImpl.java | 13 -------------
 .../main/java/net/maku/system/vo/SysDictTypeVO.java |  6 ------
 4 files changed, 35 deletions(-)

diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
index e8922af..8b889f4 100644
--- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
+++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
@@ -2,12 +2,7 @@ package net.maku.system.dao;
 
 import net.maku.framework.common.dao.BaseDao;
 import net.maku.system.entity.SysDictDataEntity;
-import net.maku.system.vo.SysDictVO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 /**
  * 字典数据
@@ -17,7 +12,4 @@ import java.util.List;
 @Mapper
 public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
 
-    @Select("${sql}")
-    List<SysDictVO.DictData> selectListForSql(@Param("sql") String sql);
-
 }
diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
index fa3b88e..471b021 100644
--- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
+++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
@@ -30,12 +30,4 @@ public class SysDictTypeEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
-	/**
-	 * 类型：1 静态常量 2 动态SQL
-	 */
-	private Integer type;
-	/**
-	 * 动态sql
-	 */
-	private String sourceSql;
 }
\ No newline at end of file
diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
index 44e4fe3..3fe0723 100644
--- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
+++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
@@ -18,7 +18,6 @@ import net.maku.system.service.SysDictTypeService;
 import net.maku.system.vo.SysDictVO;
 import net.maku.system.query.SysDictTypeQuery;
 import net.maku.system.vo.SysDictTypeVO;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -93,18 +92,6 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
                 }
             }
 
-            if(type.getType() == 2){
-                // 增加动态列表
-                String sql = type.getSourceSql();
-                if(StringUtils.isNotBlank(sql)){
-                    try {
-                        dict.setDataList(sysDictDataDao.selectListForSql(sql));
-                    } catch (Exception e) {
-                        log.error("增加动态字典异常: type=" + type, e);
-                    }
-                }
-            }
-
             dictList.add(dict);
         }
 
diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
index 13cb4f4..c4dcea0 100644
--- a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
+++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
@@ -45,10 +45,4 @@ public class SysDictTypeVO implements Serializable {
 	@Schema(description = "更新时间")
 	@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
 	private Date updateTime;
-
-	@Schema(description = "类型：1 静态常量 2 动态SQL")
-	private Integer type;
-
-	@Schema(description = "动态sql")
-	private String sourceSql;
 }
\ No newline at end of file
-- 
Gitee