guoyujia пре 3 месеци
родитељ
комит
624c558708

+ 2 - 1
src/main/java/cn/ezhizao/project/system/controller/SysDictDataController.java

@@ -8,6 +8,7 @@ import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.system.domain.SysDictData;
+import cn.ezhizao.project.system.domain.SysDictType;
 import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.system.service.ISysDictTypeService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -83,7 +84,7 @@ public class SysDictDataController extends BaseController
     {
         Map<String, List<SysDictData>> result = new HashMap<>();
         for (String dictType : dictTypes) {
-            List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+            List<SysDictData> data = dictDataService.selectDictValueByType(dictType);
             if (data != null && !data.isEmpty()) {
                 result.put(dictType, data);
             }

+ 1 - 0
src/main/java/cn/ezhizao/project/system/mapper/SysDictDataMapper.java

@@ -27,6 +27,7 @@ public interface SysDictDataMapper
      * @return 字典数据集合信息
      */
     public List<SysDictData> selectDictDataByType(String dictType);
+    public List<SysDictData> selectDictValueByType(String dictType);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息

+ 3 - 0
src/main/java/cn/ezhizao/project/system/service/ISysDictDataService.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.system.service;
 
 import cn.ezhizao.project.system.domain.SysDictData;
+import cn.ezhizao.project.system.domain.SysDictType;
 
 import java.util.List;
 
@@ -63,4 +64,6 @@ public interface ISysDictDataService
      * 查询单个字典数据
      */
     public SysDictData getDictData(SysDictData dictData);
+
+    List<SysDictData> selectDictValueByType(String dictType);
 }

+ 4 - 0
src/main/java/cn/ezhizao/project/system/service/impl/SysDictDataServiceImpl.java

@@ -114,4 +114,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     public SysDictData getDictData(SysDictData dictData) {
         return dictDataMapper.getDictData(dictData);
     }
+    @Override
+    public List<SysDictData> selectDictValueByType(String dictType) {
+        return dictDataMapper.selectDictValueByType(dictType);
+    }
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/system/service/impl/SysDictTypeServiceImpl.java

@@ -98,6 +98,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         return null;
     }
 
+
     /**
      * 根据字典类型ID查询信息
      *

+ 4 - 0
src/main/resources/mybatis/system/SysDictDataMapper.xml

@@ -41,6 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by dict_sort asc
 	</select>
 
+	<select id="selectDictValueByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+		<include refid="selectDictDataVo"/>
+		where status = '0' and dict_type = #{dictType} order by dict_sort asc
+	</select>
 	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc