代码调整

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml

@@ -20,13 +20,16 @@
              sys_dict_type sys_dict_type
         WHERE sys_dict_data.type_id = sys_dict_type.id
         AND sys_dict_type.name = #{dictypeName}
-        order by sort
+        and sys_dict_data.state = 1
+        order by sys_dict_data.sort
     </select>
     <!-- 根据字典名称查询字典数据-->
     <select id="getDicDataByName" resultType="DictData">
         SELECT sys_dict_data.*
         FROM sys_dict_data sys_dict_data
         WHERE sys_dict_data.name = #{dicName}
+        and sys_dict_data.state = 1
+        order by sys_dict_data.sort
     </select>
 
     <!-- 根据字典名称查询字典数据-->
@@ -34,6 +37,8 @@
         SELECT sys_dict_data.*
         FROM sys_dict_data sys_dict_data
         WHERE sys_dict_data.code = #{code}
+        and sys_dict_data.state = 1
+         order by sys_dict_data.sort
     </select>
 
     <select id="getDicDataByNameAndTypeName" resultType="DictData">
@@ -57,6 +62,7 @@
              sys_dict_type sys_dict_type
         WHERE sys_dict_data.type_id = sys_dict_type.id
           AND sys_dict_type.code = #{dictTypeCode}
+          and sys_dict_data.state = 1
         order by sort
     </select>
 </mapper>

pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java

@@ -85,7 +85,7 @@ public interface IDictDataService extends IService<DictData> {
 
     /**
      *
-     * @param cpde 字典code
+     * @param code 字典code
      * @return 根据字典code查询字典数据
      */
     DictData getDicDataByCode(String code);