Browse Source

!457 【轻量级 PR】:解决敏感词导出和字典数据编辑保存的两个BUG
Merge pull request !457 from clockdotnet/master_pr

芋道源码 1 year ago
parent
commit
89e785dc49

+ 2 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert;
 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
@@ -23,7 +24,7 @@ public class SensitiveWordExcelVO {
     @ExcelProperty("敏感词")
     private String name;
 
-    @ExcelProperty("标签")
+    @ExcelProperty(value = "标签", converter = JsonConvert.class)
     private List<String> tags;
 
     @ExcelProperty(value = "状态", converter = DictConvert.class)

+ 2 - 3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java

@@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.dict;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -57,6 +55,7 @@ public class DictDataDO extends BaseDO {
     /**
      * css 样式
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String cssClass;
     /**
      * 备注