Преглед изворни кода

fix:字典修改缺少set标签

侯茂昌 пре 1 година
родитељ
комит
d9462a9c91

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableController.java

@@ -106,7 +106,7 @@ public class DragTableController extends BaseController {
         if(dragTableVo.getDragTableStyleList().size() > 0){
             dragTableStyleService.batchInsertDragTableStyle(dragTableVo);
         }
-        ////新增动态表格数据统计信息
+        //新增动态表格数据统计信息
         //if(dragTableVo.getDragTableStatisticList().size() > 0){
         //    dragTableStatisticService.batchInsertDragTableStatistic(dragTableVo);
         //}

+ 0 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DragTableGroupMapper.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.entity.DragTableGroup;
-import com.ruoyi.system.entity.vo.DragTableGroupVo;
-
 import java.util.List;
 
 /**

+ 24 - 23
ruoyi-system/src/main/resources/mapper/common/SysDictDataMapper.xml

@@ -72,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<update id="updateDictData" parameterType="SysDictData">
  		update sys_dict_data
- 		<set>
  			<if test="dictSort != null">dict_sort = #{dictSort},</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
  			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
@@ -83,8 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
+			<if test="updateById != null and updateById != ''">update_by_id = #{updateById},</if>
+            update_time = sysdate()
  		where dict_code = #{dictCode}
 	</update>
 	
@@ -94,28 +93,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	
  	<insert id="insertDictData" parameterType="SysDictData">
  		insert into sys_dict_data(
- 			<if test="dictSort != null">dict_sort,</if>
- 			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
- 			<if test="dictValue != null and dictValue != ''">dict_value,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="cssClass != null and cssClass != ''">css_class,</if>
- 			<if test="listClass != null and listClass != ''">list_class,</if>
- 			<if test="isDefault != null and isDefault != ''">is_default,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+				<if test="dictSort != null">dict_sort,</if>
+				<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
+				<if test="dictValue != null and dictValue != ''">dict_value,</if>
+				<if test="dictType != null and dictType != ''">dict_type,</if>
+				<if test="cssClass != null and cssClass != ''">css_class,</if>
+				<if test="listClass != null and listClass != ''">list_class,</if>
+				<if test="isDefault != null and isDefault != ''">is_default,</if>
+				<if test="status != null">status,</if>
+				<if test="remark != null and remark != ''">remark,</if>
+				<if test="createBy != null and createBy != ''">create_by,</if>
+				<if test="createById != null and createById != ''">create_by_id,</if>
  			create_time
  		)values(
- 		    <if test="dictSort != null">#{dictSort},</if>
- 		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
- 			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
- 			<if test="listClass != null and listClass != ''">#{listClass},</if>
- 			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+				<if test="dictSort != null">#{dictSort},</if>
+				<if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
+				<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
+				<if test="dictType != null and dictType != ''">#{dictType},</if>
+				<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
+				<if test="listClass != null and listClass != ''">#{listClass},</if>
+				<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
+				<if test="status != null">#{status},</if>
+				<if test="remark != null and remark != ''">#{remark},</if>
+				<if test="createBy != null and createBy != ''">#{createBy},</if>
+				<if test="createById != null and createById != ''">#{createById},</if>
  			sysdate()
  		)
 	</insert>

+ 14 - 11
ruoyi-system/src/main/resources/mapper/common/SysDictTypeMapper.xml

@@ -78,25 +78,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="updateById != null and updateById != ''">update_by_id = #{updateById},</if>
  			update_time = sysdate()
- 		</set>
+		</set>
  		where dict_id = #{dictId}
 	</update>
  	
  	<insert id="insertDictType" parameterType="SysDictType">
  		insert into sys_dict_type(
- 			<if test="dictName != null and dictName != ''">dict_name,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+				<if test="dictName != null and dictName != ''">dict_name,</if>
+				<if test="dictType != null and dictType != ''">dict_type,</if>
+				<if test="status != null">status,</if>
+				<if test="remark != null and remark != ''">remark,</if>
+				<if test="createById != null and createById != ''">create_by_id,</if>
+				<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="dictName != null and dictName != ''">#{dictName},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+				<if test="dictName != null and dictName != ''">#{dictName},</if>
+				<if test="dictType != null and dictType != ''">#{dictType},</if>
+				<if test="status != null">#{status},</if>
+				<if test="remark != null and remark != ''">#{remark},</if>
+				<if test="createById != null and createById != ''">#{createById},</if>
+				<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()
  		)
 	</insert>