Переглянути джерело

修改了最新历史版本在列表最底下的问题,将组别id设置成了按最大id加一

李英俊ya 1 місяць тому
батько
коміт
c436a26018

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -92,11 +92,11 @@ public class SysDictDataController extends BaseController
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
     {
         dict.setCreateBy(getUsername());
-        List<SysDictData> sysDictData = dictTypeService.selectDictDataByType(dict.getDictType());
+        SysDictData sysDictData = dictDataService.selectMaxIdDictByType(dict.getDictType());
         if(sysDictData ==  null){
             dict.setDictValue("1");
         }else{
-            Integer size = sysDictData.size() + 1;
+            Integer size = Integer.parseInt(sysDictData.getDictValue()) + 1;
             dict.setDictValue(size.toString());
         }
         return toAjax(dictDataService.insertDictData(dict));

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -19,6 +19,14 @@ public interface SysDictDataMapper
      */
     public List<SysDictData> selectDictDataList(SysDictData dictData);
 
+    /**
+     * 根据字典数据类型查询ID最大的字典数据
+     *
+     * @param dictType 字典数据类型
+     * @return 字典数据
+     */
+    public SysDictData selectMaxIdDictByType(String dictType);
+
     /**
      * 根据字典类型查询字典数据
      * 

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -18,6 +18,14 @@ public interface ISysDictDataService
      */
     public List<SysDictData> selectDictDataList(SysDictData dictData);
 
+    /**
+     * 根据字典数据类型查询ID最大的字典数据
+     *
+     * @param dictType 字典数据类型
+     * @return 字典数据
+     */
+    public SysDictData selectMaxIdDictByType(String dictType);
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      * 

+ 10 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -31,6 +31,16 @@ public class SysDictDataServiceImpl implements ISysDictDataService
         return dictDataMapper.selectDictDataList(dictData);
     }
 
+    /**
+     * 根据字典数据类型查询ID最大的字典数据
+     *
+     * @param dictType 字典数据类型
+     * @return 字典数据
+     */
+    @Override
+    public SysDictData selectMaxIdDictByType(String dictType){
+        return dictDataMapper.selectMaxIdDictByType(dictType);
+    };
     /**
      * 根据字典类型和字典键值查询字典数据信息
      * 

+ 7 - 1
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -40,7 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 		order by dict_sort asc
 	</select>
-	
+
+<!--	获取当前类别主键最大的记录-->
+	<select  id="selectMaxIdDictByType" parameterType="String" resultMap="SysDictDataResult">
+		<include refid="selectDictDataVo"/>
+		where dict_code = (select max(dict_code) from sys_dict_data where dict_type = #{dictType})
+	</select>
+
 	<select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/SysRepoHistoryMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileName != null  and fileName != ''"> and file_name = #{fileName}</if>
             <if test="remark != null and remark != ''"> and remark = #{remark}</if>
         </where>
+        order by h_id desc
     </select>
 
     <select id="selectSysRepoHistory" parameterType="SysRepoHistory" resultMap="SysRepoHistoryResult">